On Tue, Oct 31, 2006 at 09:34:25PM -0800, Chris Wright wrote:
> -stable review patch. If anyone has any objections, please let us know.
> ------------------
>
> From: Akinobu Mita <[email protected]>
>
> [WATCHDOG] sc1200wdt.c pnp unregister fix.
>
> If no devices found or invalid parameter is specified,
> scl200wdt_pnp_driver is left unregistered.
> It breaks global list of pnp drivers.
>
> Signed-off-by: Akinobu Mita <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
> Signed-off-by: Andrew Morton <[email protected]>
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
> Signed-off-by: Chris Wright <[email protected]>
>
> ---
> drivers/char/watchdog/sc1200wdt.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> --- linux-2.6.18.1.orig/drivers/char/watchdog/sc1200wdt.c
> +++ linux-2.6.18.1/drivers/char/watchdog/sc1200wdt.c
> @@ -392,7 +392,7 @@ static int __init sc1200wdt_init(void)
> if (io == -1) {
> printk(KERN_ERR PFX "io parameter must be specified\n");
> ret = -EINVAL;
> - goto out_clean;
> + goto out_pnp;
> }
>
> #if defined CONFIG_PNP
> @@ -405,7 +405,7 @@ static int __init sc1200wdt_init(void)
> if (!request_region(io, io_len, SC1200_MODULE_NAME)) {
> printk(KERN_ERR PFX "Unable to register IO port %#x\n", io);
> ret = -EBUSY;
> - goto out_clean;
> + goto out_pnp;
> }
>
> ret = sc1200wdt_probe();
> @@ -435,6 +435,11 @@ out_rbt:
> out_io:
> release_region(io, io_len);
>
> +out_pnp:
> +#if defined CONFIG_PNP
> + if (isapnp)
> + pnp_unregister_driver(&scl200wdt_pnp_driver);
> +#endif
> goto out_clean;
> }
The first hunk seems to be valid for 2.4 too. The 2nd and 3rd ones
were already in 2.4. Wim, I'm going to merge it. No objection ?
Willy
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
