[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>
This commit is contained in:
parent
8de6fc1e20
commit
b41a9f59d1
@ -321,7 +321,7 @@ wdt_init(void)
|
|||||||
WATCHDOG_TIMEOUT);
|
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",
|
printk (KERN_ERR PFX "I/O address 0x%04x already in use\n",
|
||||||
wdt_io);
|
wdt_io);
|
||||||
ret = -EIO;
|
ret = -EIO;
|
||||||
@ -352,7 +352,7 @@ out:
|
|||||||
unreg_reboot:
|
unreg_reboot:
|
||||||
unregister_reboot_notifier(&wdt_notifier);
|
unregister_reboot_notifier(&wdt_notifier);
|
||||||
unreg_regions:
|
unreg_regions:
|
||||||
release_region(wdt_io, 1);
|
release_region(wdt_io, 2);
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -361,7 +361,7 @@ wdt_exit(void)
|
|||||||
{
|
{
|
||||||
misc_deregister(&wdt_miscdev);
|
misc_deregister(&wdt_miscdev);
|
||||||
unregister_reboot_notifier(&wdt_notifier);
|
unregister_reboot_notifier(&wdt_notifier);
|
||||||
release_region(wdt_io,1);
|
release_region(wdt_io, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
module_init(wdt_init);
|
module_init(wdt_init);
|
||||||
|
Loading…
Reference in New Issue
Block a user