evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

watchdog: via_wdt: Set min_timeout and max_timeout for wdt_dev

Browse source 
Let the watchdog core to check the valid value range of min_timeout/max_timeout.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Axel Lin 2012-01-21 15:08:38 +08:00 • committed by Wim Van Sebroeck
parent b1785dfd4f
commit f6dd94f819
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/watchdog/via_wdt.c
View file

@ -124,8 +124,6 @@ static int wdt_stop(struct watchdog_device *wdd)
static int wdt_set_timeout(struct watchdog_device *wdd, static int wdt_set_timeout(struct watchdog_device *wdd,
unsigned int new_timeout) unsigned int new_timeout)
{ {
if (new_timeout < 1 || new_timeout > WDT_TIMEOUT_MAX)
return -EINVAL;
writel(new_timeout, wdt_mem + VIA_WDT_COUNT); writel(new_timeout, wdt_mem + VIA_WDT_COUNT);
timeout = new_timeout; timeout = new_timeout;
return 0; return 0;
@ -150,6 +148,8 @@ static const struct watchdog_ops wdt_ops = {
static struct watchdog_device wdt_dev = { static struct watchdog_device wdt_dev = {
.info = &wdt_info, .info = &wdt_info,
.ops = &wdt_ops, .ops = &wdt_ops,
.min_timeout = 1,
.max_timeout = WDT_TIMEOUT_MAX,
}; };
static int __devinit wdt_probe(struct pci_dev *pdev, static int __devinit wdt_probe(struct pci_dev *pdev,