diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-12-15 22:49:59 -0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2014-12-18 16:01:20 +0100 |
| commit | ba90f261cdcbf5535bb46381b1849815268daa3f (patch) | |
| tree | 6edca962bed86b03168481d80cb74780e31aa2a5 /drivers/watchdog | |
| parent | aefbaf3a3fa030ed7ef3cc9456ed82e6611c1dcb (diff) | |
| download | blackbird-op-linux-ba90f261cdcbf5535bb46381b1849815268daa3f.tar.gz blackbird-op-linux-ba90f261cdcbf5535bb46381b1849815268daa3f.zip | |
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>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/imx2_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |
