Skip to content

Commit

Permalink
watchdog: imx2_wdt: Fix the argument of watchdog_active()
Browse files Browse the repository at this point in the history
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 <build@lixom.net>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  • Loading branch information
Fabio Estevam authored and Wim Van Sebroeck committed Dec 18, 2014
1 parent aefbaf3 commit ba90f26
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/watchdog/imx2_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit ba90f26

Please sign in to comment.