Merge remote-tracking branch 'net-next/master' into mac80211-next

[linux-2.6-block.git] / drivers / watchdog / omap_wdt.c

diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 1b02bfa81b2960059354c3e581b1118f359d2938..ae77112ce97f74e863edb3e1172632425c3ef970 100644 (file)
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -253,10 +253,10 @@ static int omap_wdt_probe(struct platform_device *pdev)
        wdev->wdog.ops = &omap_wdt_ops;
        wdev->wdog.min_timeout = TIMER_MARGIN_MIN;
        wdev->wdog.max_timeout = TIMER_MARGIN_MAX;
+       wdev->wdog.timeout = TIMER_MARGIN_DEFAULT;
        wdev->wdog.parent = &pdev->dev;
 
-       if (watchdog_init_timeout(&wdev->wdog, timer_margin, &pdev->dev) < 0)
-               wdev->wdog.timeout = TIMER_MARGIN_DEFAULT;
+       watchdog_init_timeout(&wdev->wdog, timer_margin, &pdev->dev);
 
        watchdog_set_nowayout(&wdev->wdog, nowayout);