diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2024-09-05 16:51:58 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2024-09-05 16:57:36 +0200 |
| commit | 56d8b784c56588cd40f98e4b1d4f6e29e3cb02b8 (patch) | |
| tree | 5edd10e48440fcbb5a76bbb9b78dc1706b3d5cec /drivers/platform/surface/aggregator | |
| parent | 3a1fb526c2482b2f61c9813e9e14fcdab4ffa390 (diff) | |
| parent | a54da9df75cd1b4b5028f6c60f9a211532680585 (diff) | |
Merge tag 'hwmon-for-v6.11-rc7' into review-hans
Merge "hwmon fixes for v6.11-rc7" into review-hans to bring in
commit a54da9df75cd ("hwmon: (hp-wmi-sensors) Check if WMI event
data exists").
This is a dependency for a set of WMI event data refactoring changes.
Diffstat (limited to 'drivers/platform/surface/aggregator')
| -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 27eadf22b292..a265e667538c 100644 --- a/drivers/platform/surface/aggregator/controller.c +++ b/drivers/platform/surface/aggregator/controller.c @@ -1392,7 +1392,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 |