On Mon, Sep 22, 2014 at 06:00:52PM +0800, Xiubo Li wrote:
> Add power management operations(suspend and resume) as part of
> dev_pm_ops for IMX2 watchdog driver.
>
> Signed-off-by: Xiubo Li <Li.Xiubo@xxxxxxxxxxxxx>
> ---
> drivers/watchdog/imx2_wdt.c | 47 +++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 47 insertions(+)
>
> diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
> index 68c3d37..941c36f 100644
> --- a/drivers/watchdog/imx2_wdt.c
> +++ b/drivers/watchdog/imx2_wdt.c
> @@ -295,6 +295,52 @@ static void imx2_wdt_shutdown(struct platform_device *pdev)
> }
> }
>
> +#ifdef CONFIG_PM_SLEEP
> +/* Disable watchdog if it is active during suspend */
> +static int imx2_wdt_suspend(struct device *dev)
> +{
> + struct watchdog_device *wdog = dev_get_drvdata(dev);
> + struct imx2_wdt_device *wdev = watchdog_get_drvdata(wdog);
> +
> + imx2_wdt_set_timeout(wdog, IMX2_WDT_MAX_TIME);
> + imx2_wdt_ping(wdog);
> +
> + /* Watchdog has been stopped but IP block is still running */
> + if (!watchdog_active(&wdog) && imx2_wdt_is_running(wdev))
Turns out this has a bug.
s/&wdog/wdog/
Please resubmit.
Thanks,
Guenter
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
