diff options
| author |   Tomas Winkler <tomas.winkler@intel.com> | 2014-02-17 15:13:19 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-18 10:04:35 -0800 |
| commit | 487056932d372cc4f6c636f21a928d6667b151d7 (patch) | |
| tree | eba69647e4de95664345f76bdc984aa5c2f86032 /drivers/misc/mei/nfc.c | |
| parent | Merge 3.14-rc3 into char-misc-next (diff) | |
| download | linux-dev-487056932d372cc4f6c636f21a928d6667b151d7.tar.xz linux-dev-487056932d372cc4f6c636f21a928d6667b151d7.zip | |
mei: Remove all bus devices from the mei_dev list when stopping the MEI
When stopping the MEI, we should remove and potentially unregister
all bus devices queued on the mei_dev linked list.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/misc/mei/nfc.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/misc/mei/nfc.c b/drivers/misc/mei/nfc.c index a58320c0c049..7626dde5e1f5 100644 --- a/drivers/misc/mei/nfc.c +++ b/drivers/misc/mei/nfc.c @@ -552,13 +552,7 @@ err: void mei_nfc_host_exit(struct mei_device *dev) { struct mei_nfc_dev *ndev = &nfc_dev; - cancel_work_sync(&ndev->init_work); +} - mutex_lock(&dev->device_lock); - if (ndev->cl && ndev->cl->device) - mei_cl_remove_device(ndev->cl->device); - mei_nfc_free(ndev); - mutex_unlock(&dev->device_lock); -} |