From: Samuel Tardieu <sam@rfc1149.net>
Date: Thu, 7 Sep 2006 09:57:00 +0000 (+0200)
Subject: [WATCHDOG] w83697hf/hg WDT driver - patch 2
X-Git-Tag: v2.6.19-rc3~1^2~23
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=b41a9f59d13a4c4c3f0e0b8d9ff15743607096a2;p=powerpc.git

[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>
---

diff --git a/drivers/char/watchdog/w83697hf_wdt.c b/drivers/char/watchdog/w83697hf_wdt.c
index c31121eab3..4f81943fe7 100644
--- a/drivers/char/watchdog/w83697hf_wdt.c
+++ b/drivers/char/watchdog/w83697hf_wdt.c
@@ -321,7 +321,7 @@ wdt_init(void)
 			WATCHDOG_TIMEOUT);
 	}
 
-	if (!request_region(wdt_io, 1, WATCHDOG_NAME)) {
+	if (!request_region(wdt_io, 2, WATCHDOG_NAME)) {
 		printk (KERN_ERR PFX "I/O address 0x%04x already in use\n",
 			wdt_io);
 		ret = -EIO;
@@ -352,7 +352,7 @@ out:
 unreg_reboot:
 	unregister_reboot_notifier(&wdt_notifier);
 unreg_regions:
-	release_region(wdt_io, 1);
+	release_region(wdt_io, 2);
 	goto out;
 }
 
@@ -361,7 +361,7 @@ wdt_exit(void)
 {
 	misc_deregister(&wdt_miscdev);
 	unregister_reboot_notifier(&wdt_notifier);
-	release_region(wdt_io,1);
+	release_region(wdt_io, 2);
 }
 
 module_init(wdt_init);