From ba90f261cdcbf5535bb46381b1849815268daa3f Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 15 Dec 2014 22:49:59 -0200 Subject: watchdog: imx2_wdt: Fix the argument of watchdog_active() Fix the following build warning by passing the expected argument type to watchdog_active(): drivers/watchdog/imx2_wdt.c: In function 'imx2_wdt_suspend': drivers/watchdog/imx2_wdt.c:340:2: warning: passing argument 1 of 'watchdog_active' from incompatible pointer type [enabled by default] In file included from drivers/watchdog/imx2_wdt.c:38:0: include/linux/watchdog.h:104:20: note: expected 'struct watchdog_device *' but argument is of type 'struct watchdog_device **' Reported-by: Olof's autobuilder Signed-off-by: Fabio Estevam Reviewed-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck --- drivers/watchdog/imx2_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/watchdog') diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index 51d940beb311..d6add516a7a7 100644 --- 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); -- cgit v1.2.3-59-g8ed1b