Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

[deliverable/linux.git] / drivers / watchdog / via_wdt.c

diff --git a/drivers/watchdog/via_wdt.c b/drivers/watchdog/via_wdt.c
index d2cd9f0bcb9a2df915472446f295139f04fc0ede..56369c4f1961d0c2001094f680a6c7ed81c54ca2 100644 (file)
--- 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);