diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2014-04-01 15:49:19 +0200 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2014-06-10 21:38:25 +0200 |
commit | 3813ff8b38b265b6c25f3946d5850273deba03a3 (patch) | |
tree | 7e99cdbacd3f3db9aad0f0f1b97eedd40e210df0 | |
parent | 1e8c8a5b484f99d82bd961d10705896385cafc06 (diff) | |
download | linux-stable-3813ff8b38b265b6c25f3946d5850273deba03a3.tar.gz linux-stable-3813ff8b38b265b6c25f3946d5850273deba03a3.tar.bz2 linux-stable-3813ff8b38b265b6c25f3946d5850273deba03a3.zip |
watchdog: via_wdt: replace del_timer by del_timer_sync
Use del_timer_sync to ensure that the timer is stopped on all CPUs before
the driver exits.
This change was suggested by Thomas Gleixner.
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@r@
identifier i,t,ex;
@@
struct t i = { .remove = ex, };
@@
identifier r.ex;
@@
ex(...) {
<...
- del_timer
+ del_timer_sync
(...)
...>
}
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
-rw-r--r-- | drivers/watchdog/via_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/via_wdt.c b/drivers/watchdog/via_wdt.c index d2cd9f0bcb9a..56369c4f1961 100644 --- a/drivers/watchdog/via_wdt.c +++ b/drivers/watchdog/via_wdt.c @@ -232,7 +232,7 @@ err_out_disable_device: static void wdt_remove(struct pci_dev *pdev) { watchdog_unregister_device(&wdt_dev); - del_timer(&timer); + del_timer_sync(&timer); iounmap(wdt_mem); release_mem_region(mmio, VIA_WDT_MMIO_LEN); release_resource(&wdt_res); |