diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-08-22 01:34:27 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-08-22 01:34:27 +0300 |
| commit | 872cf28b8df9c5c3a1e71a88ee750df7c2513971 (patch) | |
| tree | e50ebff649cf05ab11e88e783c4d4ea32692c666 /drivers/platform/surface/aggregator/controller.c | |
| parent | 5c6154ffd40c5bca1eb01f9bf5a4d2b6d18d55bd (diff) | |
| parent | 46ee21e9f59205e54943dfe51b2dc8a9352ca37d (diff) | |
| download | linux-872cf28b8df9c5c3a1e71a88ee750df7c2513971.tar.xz | |
Merge tag 'platform-drivers-x86-v6.11-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
Pull x86 platform driver fixes from Ilpo Järvinen:
- ISST: Fix an error-handling corner case
- platform/surface: aggregator: Minor corner case fix and new HW
support
* tag 'platform-drivers-x86-v6.11-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
platform/x86: ISST: Fix return value on last invalid resource
platform/surface: aggregator: Fix warning when controller is destroyed in probe
platform/surface: aggregator_registry: Add support for Surface Laptop 6
platform/surface: aggregator_registry: Add fan and thermal sensor support for Surface Laptop 5
platform/surface: aggregator_registry: Add support for Surface Laptop Studio 2
platform/surface: aggregator_registry: Add support for Surface Laptop Go 3
platform/surface: aggregator_registry: Add Support for Surface Pro 10
platform/x86: asus-wmi: Add quirk for ROG Ally X
Diffstat (limited to 'drivers/platform/surface/aggregator/controller.c')
| -rw-r--r-- | drivers/platform/surface/aggregator/controller.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/surface/aggregator/controller.c b/drivers/platform/surface/aggregator/controller.c index 7fc602e01487..7e89f547999b 100644 --- a/drivers/platform/surface/aggregator/controller.c +++ b/drivers/platform/surface/aggregator/controller.c @@ -1354,7 +1354,8 @@ void ssam_controller_destroy(struct ssam_controller *ctrl) if (ctrl->state == SSAM_CONTROLLER_UNINITIALIZED) return; - WARN_ON(ctrl->state != SSAM_CONTROLLER_STOPPED); + WARN_ON(ctrl->state != SSAM_CONTROLLER_STOPPED && + ctrl->state != SSAM_CONTROLLER_INITIALIZED); /* * Note: New events could still have been received after the previous |