[PATCH] janitor: sc520_wdt

Insert ioremap error check and adjust cleanup path accordingly.

From: Leann Ogasawara <ogasawara@osdl.org>

diff --git a/drivers/char/watchdog/sc520_wdt.c b/drivers/char/watchdog/sc520_wdt.c
index a2ca29f6a896393c56196ad888d6cb7de116c2f8..e8e0e9d149d179cd21cb268bba078de665acbd4c 100644 (file)
--- a/drivers/char/watchdog/sc520_wdt.c
+++ b/drivers/char/watchdog/sc520_wdt.c
@@ -423,11 +423,18 @@ static int __init sc520_wdt_init(void)
 
        wdtmrctl = (__u16 *)((char *)wdtmrctl + OFFS_WDTMRCTL);
        wdtmrctl = ioremap((unsigned long)wdtmrctl, 2);
+       if (!wdtmrctl) {
+               printk (KERN_ERR PFX "Unable to remap memory.\n");
+               rc = -ENOMEM;
+               goto err_out_notifier;
+       }
        printk(KERN_INFO PFX "WDT driver for SC520 initialised. timeout=%d sec (nowayout=%d)\n",
                timeout,nowayout);
 
        return 0;
 
+err_out_notifier:
+       unregister_reboot_notifier(&wdt_notifier);
 err_out_miscdev:
        misc_deregister(&wdt_miscdev);
 err_out_region2: