summaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/init.c
diff options
context:
space:
mode:
authorAlexander Usyskin <alexander.usyskin@intel.com>2016-09-25 13:25:31 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-27 12:33:47 +0200
commit1892fc2ee4c08d7ac17adb93f1341d9c3d7bdaf6 (patch)
treed4ab5c7663479092db1fa3308ded6f82cbe253cc /drivers/misc/mei/init.c
parent6eb1c9496b81680f2cd2e0eda06c531317e2e28d (diff)
downloadlinux-stable-1892fc2ee4c08d7ac17adb93f1341d9c3d7bdaf6.tar.gz
linux-stable-1892fc2ee4c08d7ac17adb93f1341d9c3d7bdaf6.tar.bz2
linux-stable-1892fc2ee4c08d7ac17adb93f1341d9c3d7bdaf6.zip
mei: stop the stall timer worker if not needed
The stall timer worker checks periodically if there is a stalled i/o transaction. The issue with the current implementation is that the timer is ticking also when there is no pending i/o transaction. This patch provides a simple change that prevents rescheduling of the delayed work when there is no pending i/o. Cc: Andy Lutomirski <luto@kernel.org> Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/init.c')
-rw-r--r--drivers/misc/mei/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index f7c8dfdb6a12..9a9c2484d107 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -94,7 +94,7 @@ void mei_cancel_work(struct mei_device *dev)
cancel_work_sync(&dev->reset_work);
cancel_work_sync(&dev->bus_rescan_work);
- cancel_delayed_work(&dev->timer_work);
+ cancel_delayed_work_sync(&dev->timer_work);
}
EXPORT_SYMBOL_GPL(mei_cancel_work);