diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-09-20 01:24:24 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-09-20 01:24:24 -0700 |
| commit | 36ec807b627b4c0a0a382f0ae48eac7187d14b2b (patch) | |
| tree | df9d682d66492722dbd186bd01af2d7334ea408a /drivers/platform/surface/aggregator/controller.c | |
| parent | eb017f4ea13b1a5ad7f4332279f2e4c67b44bdea (diff) | |
| parent | 55bef83509f0cbe4cc54a583ac0313389dabee66 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.12 merge window.
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 |