diff options
author | Samuel Tardieu <sam@rfc1149.net> | 2006-09-07 05:57:00 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2006-10-04 16:43:13 -0400 |
commit | b41a9f59d13a4c4c3f0e0b8d9ff15743607096a2 (patch) | |
tree | 09a388bd4412c08d345a6a9d45e23af05bf2a112 /drivers/char/watchdog | |
parent | 8de6fc1e2023954ec21d4e84d002839afed4cad3 (diff) |
[WATCHDOG] w83697hf/hg WDT driver - patch 2
This is patch 2 in the series of patches that converts
Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's
w83697hf/hg watchdog driver.
This patch contains following changes:
- wdt_io is 2 bytes long. We should do a
request_region for 2 bytes instead of 1.
Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/char/watchdog')
-rw-r--r-- | drivers/char/watchdog/w83697hf_wdt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/watchdog/w83697hf_wdt.c b/drivers/char/watchdog/w83697hf_wdt.c index c31121eab3c9..4f81943fe7fa 100644 --- a/drivers/char/watchdog/w83697hf_wdt.c +++ b/drivers/char/watchdog/w83697hf_wdt.c | |||
@@ -321,7 +321,7 @@ wdt_init(void) | |||
321 | WATCHDOG_TIMEOUT); | 321 | WATCHDOG_TIMEOUT); |
322 | } | 322 | } |
323 | 323 | ||
324 | if (!request_region(wdt_io, 1, WATCHDOG_NAME)) { | 324 | if (!request_region(wdt_io, 2, WATCHDOG_NAME)) { |
325 | printk (KERN_ERR PFX "I/O address 0x%04x already in use\n", | 325 | printk (KERN_ERR PFX "I/O address 0x%04x already in use\n", |
326 | wdt_io); | 326 | wdt_io); |
327 | ret = -EIO; | 327 | ret = -EIO; |
@@ -352,7 +352,7 @@ out: | |||
352 | unreg_reboot: | 352 | unreg_reboot: |
353 | unregister_reboot_notifier(&wdt_notifier); | 353 | unregister_reboot_notifier(&wdt_notifier); |
354 | unreg_regions: | 354 | unreg_regions: |
355 | release_region(wdt_io, 1); | 355 | release_region(wdt_io, 2); |
356 | goto out; | 356 | goto out; |
357 | } | 357 | } |
358 | 358 | ||
@@ -361,7 +361,7 @@ wdt_exit(void) | |||
361 | { | 361 | { |
362 | misc_deregister(&wdt_miscdev); | 362 | misc_deregister(&wdt_miscdev); |
363 | unregister_reboot_notifier(&wdt_notifier); | 363 | unregister_reboot_notifier(&wdt_notifier); |
364 | release_region(wdt_io,1); | 364 | release_region(wdt_io, 2); |
365 | } | 365 | } |
366 | 366 | ||
367 | module_init(wdt_init); | 367 | module_init(wdt_init); |