Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e85b364 authored by Samuel Ortiz's avatar Samuel Ortiz Committed by Greg Kroah-Hartman
Browse files

mei: init: Flush scheduled work before resetting the device 



Flushing pending work items before resetting the device makes more
sense than doing so afterwards. Some of them, like e.g. the NFC
initialization one, find themselves with client IDs changed after
the reset, eventually leading to trigger a client.c:mei_me_cl_by_id()
warning after a few modprobe/rmmod cycles.

Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 317ddd25

drivers/misc/mei/init.c

+2 −2
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ void mei_stop(struct mei_device *dev) 
{

	dev_dbg(&dev->pdev->dev, "stopping the device.\n");



	flush_scheduled_work();



	mutex_lock(&dev->device_lock);



	cancel_delayed_work(&dev->timer_work);
@@ -210,8 +212,6 @@ void mei_stop(struct mei_device *dev) 


	mutex_unlock(&dev->device_lock);



	flush_scheduled_work();



	mei_watchdog_unregister(dev);

}

EXPORT_SYMBOL_GPL(mei_stop);