Merge branch 'sfi' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux into...

[linux-2.6-microblaze.git] / drivers / watchdog / imx2_wdt.c

diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index 51d940b..d6add51 100644 (file)
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -337,7 +337,7 @@ static int imx2_wdt_suspend(struct device *dev)
        imx2_wdt_ping(wdog);
 
        /* Watchdog has been stopped but IP block is still running */
-       if (!watchdog_active(&wdog) && imx2_wdt_is_running(wdev))
+       if (!watchdog_active(wdog) && imx2_wdt_is_running(wdev))
                del_timer_sync(&wdev->timer);
 
        clk_disable_unprepare(wdev->clk);