4 files changed, 24 insertions, 5 deletions

diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index 6d7d4157e0..3cd79caad7 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -1398,7 +1398,7 @@ static int __init asus_acpi_init(void)
         if (!asus_hotk_found) {
                 acpi_bus_unregister_driver(&asus_hotk_driver);
                 remove_proc_entry(PROC_ASUS, acpi_root_dir);
-                return result;
+                return -ENODEV;
         }
 
         asus_backlight_device = backlight_device_register("asus",NULL,NULL,
@@ -1407,6 +1407,7 @@ static int __init asus_acpi_init(void)
                 printk(KERN_ERR "Could not register asus backlight device\n");
                 asus_backlight_device = NULL;
                 asus_acpi_exit();
+                return -ENODEV;
         }
         asus_backlight_device->props.max_brightness = 15;
 
diff --git a/drivers/misc/blink.c b/drivers/misc/blink.c
index 634431ce11..97f7253ce2 100644
--- a/drivers/misc/blink.c
+++ b/drivers/misc/blink.c
@@ -16,12 +16,30 @@ static void do_blink(unsigned long data)
         add_timer(&blink_timer);
 }
 
-static int blink_init(void)
+static int blink_panic_event(struct notifier_block *blk,
+                             unsigned long event, void *arg)
 {
-        printk(KERN_INFO "Enabling keyboard blinking\n");
         do_blink(0);
         return 0;
 }
 
+static struct notifier_block blink_notify = {
+        .notifier_call = blink_panic_event,
+};
+
+static __init int blink_init(void)
+{
+        printk(KERN_INFO "Enabling keyboard blinking\n");
+        atomic_notifier_chain_register(&panic_notifier_list, &blink_notify);
+        return 0;
+}
+
+static __exit void blink_remove(void)
+{
+        del_timer_sync(&blink_timer);
+        atomic_notifier_chain_unregister(&panic_notifier_list, &blink_notify);
+}
+
 module_init(blink_init);
+module_exit(blink_remove);
 
diff --git a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c
index 3098960dc2..3078c419cb 100644
--- a/drivers/net/irda/irport.c
+++ b/drivers/net/irda/irport.c
@@ -509,7 +509,7 @@ static void irport_timeout(struct net_device *dev)
         IRDA_DEBUG(0, "%s(), iir=%02x, lsr=%02x, iobase=%#x\n", 
                    __FUNCTION__, iir, lsr, iobase);
 
-        IRDA_DEBUG(0, "%s(), transmitting=%d, remain=%d, done=%d\n", 
+        IRDA_DEBUG(0, "%s(), transmitting=%d, remain=%d, done=%td\n",
                    __FUNCTION__, self->transmitting, self->tx_buff.len,
                    self->tx_buff.data - self->tx_buff.head);
 
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index 2803b370ba..36ab98386b 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -79,7 +79,7 @@ MODULE_AUTHOR("Daniele Peri <peri@csai.unipa.it>");
 MODULE_DESCRIPTION("SMC IrCC SIR/FIR controller driver");
 MODULE_LICENSE("GPL");
 
-static int smsc_nopnp;
+static int smsc_nopnp = 1;
 module_param_named(nopnp, smsc_nopnp, bool, 0);
 MODULE_PARM_DESC(nopnp, "Do not use PNP to detect controller settings");