From 8e2bea38ede683d9ebcbad85ecff856996eee4f8 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sat, 21 Jan 2012 15:08:38 +0800 Subject: [PATCH] --- yaml --- r: 286925 b: refs/heads/master c: f6dd94f8194408e11df4e33e1f7113612e84ca17 h: refs/heads/master i: 286923: 3a763090dccdeed6c60c3d38dc43a0e0caf2259e v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/via_wdt.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5f6b40a8b9d1..2d8952050ccc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1785dfd4fcd4011834f914810c1acb46b007a44 +refs/heads/master: f6dd94f8194408e11df4e33e1f7113612e84ca17 diff --git a/trunk/drivers/watchdog/via_wdt.c b/trunk/drivers/watchdog/via_wdt.c index 8b24b000062e..8f07dd4bd94a 100644 --- a/trunk/drivers/watchdog/via_wdt.c +++ b/trunk/drivers/watchdog/via_wdt.c @@ -124,8 +124,6 @@ static int wdt_stop(struct watchdog_device *wdd) static int wdt_set_timeout(struct watchdog_device *wdd, unsigned int new_timeout) { - if (new_timeout < 1 || new_timeout > WDT_TIMEOUT_MAX) - return -EINVAL; writel(new_timeout, wdt_mem + VIA_WDT_COUNT); timeout = new_timeout; return 0; @@ -150,6 +148,8 @@ static const struct watchdog_ops wdt_ops = { static struct watchdog_device wdt_dev = { .info = &wdt_info, .ops = &wdt_ops, + .min_timeout = 1, + .max_timeout = WDT_TIMEOUT_MAX, }; static int __devinit wdt_probe(struct pci_dev *pdev,