diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2024-09-04 12:15:38 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2024-09-04 12:15:38 +0200 |
| commit | eb876ea724835126f215c9a5bcc9e6148e2a6d15 (patch) | |
| tree | 689c215270b023c2f94a6629c7f1d3ef8e49c28a /drivers/platform/surface/aggregator/controller.c | |
| parent | 2dce993165088dbe728faa21547e3b74213b6732 (diff) | |
| parent | 67784a74e258a467225f0e68335df77acd67b7ab (diff) | |
Merge branch 'linus' into smp/core
Pull in upstream changes so further patches don't conflict.
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 7fc602e01487d..7e89f547999b2 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 |