PATCH: SBC EPX does not check/claim I/O ports it uses
Can't test this as I lack the hardware, can you check it seems right Calin.
drivers/char/watchdog/sbc_epx_c3.c +5 -0
@@ -25,6 +25,7 @@#include <linux/notifier.h> #include <linux/reboot.h> #include <linux/init.h> +#include <linux/ioport.h> #include <asm/uaccess.h> #include <asm/io.h>
@@ -180,6 +181,9 @@static int __init watchdog_init (void ) {int ret; + +if (!request_region (EPXC3_WATCHDOG_CTL_REG ,2 ,"epxc3_watchdog" )) +return -EBUSY ; ret =register_reboot_notifier (&epx_c3_notifier);if (ret) {
@@ -205,6 +209,7 @@ {misc_deregister (&epx_c3_miscdev);unregister_reboot_notifier (&epx_c3_notifier); +release_region (EPXC3_WATCHDOG_CTL_REG ,2 ); }module_init (watchdog_init);
Hi,
drivers/char/watchdog/sbc_epx_c3.c line 189
Quoted 10 lines
drivers/char/watchdog/sbc_epx_c3.c +3
-0@@ -180,6 +181,9 @@static int __init watchdog_init (void ) {int ret; + +if (!request_region (EPXC3_WATCHDOG_CTL_REG ,2 ,"epxc3_watchdog" )) +return -EBUSY ; ret =register_reboot_notifier (&epx_c3_notifier);if (ret) {
Shouldn't resource be released when register_reboot_notifier() or misc_register() fails?
Bartlomiej
Quoted 5 lines · Bartlomiej Zolnierkiewicz
Quoted 2 lines
ret = register_reboot_notifier(&epx_c3_notifier); if (ret) {Shouldn't resource be released when
register_reboot_notifier()ormisc_register()fails?
Yes, let me insert my brain and post a corrected patch.
PATCH: SBC EPX does not check/claim I/O ports it uses (2nd Edition)
In reply to Bartlomiej Zolnierkiewiczdrivers/char/watchdog/sbc_epx_c3.c +10 -2
@@ -25,6 +25,7 @@#include <linux/notifier.h> #include <linux/reboot.h> #include <linux/init.h> +#include <linux/ioport.h> #include <asm/uaccess.h> #include <asm/io.h>
@@ -180,12 +181,15 @@static int __init watchdog_init (void ) {int ret; + +if (!request_region (EPXC3_WATCHDOG_CTL_REG ,2 ,"epxc3_watchdog" )) +return -EBUSY ; ret =register_reboot_notifier (&epx_c3_notifier);if (ret) { printk(KERN_ERR PFX "cannot register reboot notifier " "(err=%d)\n", ret); -return ret; + goto out; } ret =misc_register (&epx_c3_miscdev);
@@ -193,12 +197,16 @@ printk(KERN_ERR PFX "cannot register miscdev on minor=%d " "(err=%d)\n", WATCHDOG_MINOR, ret);unregister_reboot_notifier (&epx_c3_notifier); -return ret; + goto out; }printk (banner);return 0 ; + +out: +release_region (EPXC3_WATCHDOG_CTL_REG ,2 ); +return ret; } static void __exit watchdog_exit(void)
Re: PATCH: SBC EPX does not check/claim I/O ports it uses (2nd Edition)
Quoted 37 lines · Alan Cox
Signed-off-by Alan Cox <[email protected]>drivers/char/watchdog/sbc_epx_c3.c +6
-2@@ -25,6 +25,7 @@#include <linux/notifier.h> #include <linux/reboot.h> #include <linux/init.h> +#include <linux/ioport.h> #include <asm/uaccess.h> #include <asm/io.h> @@ -180,12 +181,15 @@static int __init watchdog_init (void ) {int ret; + +if (!request_region (EPXC3_WATCHDOG_CTL_REG ,2 ,"epxc3_watchdog" )) +return -EBUSY ; ret =register_reboot_notifier (&epx_c3_notifier);if (ret) { printk(KERN_ERR PFX "cannot register reboot notifier " "(err=%d)\n", ret); -return ret; + goto out; } ret =misc_register (&epx_c3_miscdev);@@ -193,12 +197,16 @@ printk(KERN_ERR PFX "cannot register miscdev on minor=%d " "(err=%d)\n", WATCHDOG_MINOR, ret);unregister_reboot_notifier (&epx_c3_notifier); -return ret; + goto out; }
drivers/char/watchdog/sbc_epx_c3.c line 212
Quoted 10 lines
drivers/char/watchdog/sbc_epx_c3.c +4
-0printk (banner);return 0 ; + +out: +release_region (EPXC3_WATCHDOG_CTL_REG ,2 ); +return ret; } static void __exit watchdog_exit(void)
But now, you forgot to add release_region in this (exit) function :)?
regards,
Signature · 3 lines
Jiri Slaby www.fi.muni.cz/~xslaby \_.-^-._ [email protected] _.-^-._/ B67499670407CE62ACC8 22A032CC55C339D47A7E
Re: PATCH: SBC EPX does not check/claim I/O ports it uses (2nd Edition)
Quoted 3 lines · Jiri Slaby
Quoted 2 lines
static void
__exitwatchdog_exit(void)But now, you forgot to add
release_regionin this (exit) function :)?
yup. That'll give a nice oops reading /proc/ioports after rmmod...
drivers/char/watchdog/sbc_epx_c3.c renamed from drivers/char/watchdog/sbc_epx_c3.c~sbc-epx-does-not-check-claim-i-o-ports-it-uses-2nd-edition-fix +1 -0
@@ -213,6 +213,7 @@ static void __exit watchdog_exit(void) {misc_deregister (&epx_c3_miscdev);unregister_reboot_notifier (&epx_c3_notifier); +release_region (EPXC3_WATCHDOG_CTL_REG ,2 ); }module_init (watchdog_init);
_