|
@@ -260,7 +260,9 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
|
|
|
wdog->max_timeout = IMX2_WDT_MAX_TIME;
|
|
|
wdog->parent = &pdev->dev;
|
|
|
|
|
|
- clk_prepare_enable(wdev->clk);
|
|
|
+ ret = clk_prepare_enable(wdev->clk);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
|
|
|
regmap_read(wdev->regmap, IMX2_WDT_WRSR, &val);
|
|
|
wdog->bootstatus = val & IMX2_WDT_WRSR_TOUT ? WDIOF_CARDRESET : 0;
|
|
@@ -365,8 +367,11 @@ static int imx2_wdt_resume(struct device *dev)
|
|
|
{
|
|
|
struct watchdog_device *wdog = dev_get_drvdata(dev);
|
|
|
struct imx2_wdt_device *wdev = watchdog_get_drvdata(wdog);
|
|
|
+ int ret;
|
|
|
|
|
|
- clk_prepare_enable(wdev->clk);
|
|
|
+ ret = clk_prepare_enable(wdev->clk);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
|
|
|
if (watchdog_active(wdog) && !imx2_wdt_is_running(wdev)) {
|
|
|
/*
|