redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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 <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>
hifive-unleashed-5.1
Fabio Estevam 2014-12-15 22:49:59 -02:00 committed by Wim Van Sebroeck
parent aefbaf3a3f
commit ba90f261cd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/watchdog/imx2_wdt.c
View File

@ -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);