diff options
| author | Alexander Usyskin <alexander.usyskin@intel.com> | 2020-10-29 11:54:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-03 10:13:00 +0100 |
| commit | c2192bbc3c507b33dda5858049e0493c073d29fb (patch) | |
| tree | 0438f987e64913aeaa8c629f51e7b475acfb6600 | |
| parent | c7a6252b9472fd96a3dbac40c891eb9f4fe5b4f1 (diff) | |
| download | linux-stable-c2192bbc3c507b33dda5858049e0493c073d29fb.tar.gz linux-stable-c2192bbc3c507b33dda5858049e0493c073d29fb.tar.bz2 linux-stable-c2192bbc3c507b33dda5858049e0493c073d29fb.zip | |
mei: bus: deinitialize callback functions on init failure
If the initialization procedure for receive or receive callback
registration on the client bus has failed the caller can't re-run it.
Deinitilize the callback pointers and cancel the work
to allow the caller to retry.
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Link: https://lore.kernel.org/r/20201029095444.957924-4-tomas.winkler@intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/misc/mei/bus.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c index 1a54bf3ed0c3..76aa0e93748a 100644 --- a/drivers/misc/mei/bus.c +++ b/drivers/misc/mei/bus.c @@ -370,8 +370,11 @@ int mei_cldev_register_rx_cb(struct mei_cl_device *cldev, mei_cldev_cb_t rx_cb) else ret = -ENODEV; mutex_unlock(&bus->device_lock); - if (ret && ret != -EBUSY) + if (ret && ret != -EBUSY) { + cancel_work_sync(&cldev->rx_work); + cldev->rx_cb = NULL; return ret; + } return 0; } @@ -405,8 +408,11 @@ int mei_cldev_register_notif_cb(struct mei_cl_device *cldev, mutex_lock(&bus->device_lock); ret = mei_cl_notify_request(cldev->cl, NULL, 1); mutex_unlock(&bus->device_lock); - if (ret) + if (ret) { + cancel_work_sync(&cldev->notif_work); + cldev->notif_cb = NULL; return ret; + } return 0; } |