1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/input/serio/hp_sdc_mlc.c b/drivers/input/serio/hp_sdc_mlc.c
index 7d2b820ef58d..d50f0678bf47 100644
--- a/drivers/input/serio/hp_sdc_mlc.c
+++ b/drivers/input/serio/hp_sdc_mlc.c
@@ -305,6 +305,7 @@ static void hp_sdc_mlc_out(hil_mlc *mlc)
 static int __init hp_sdc_mlc_init(void)
 {
         hil_mlc *mlc = &hp_sdc_mlc;
+        int err;
 
 #ifdef __mc68000__
         if (!MACH_IS_HP300)
@@ -323,22 +324,21 @@ static int __init hp_sdc_mlc_init(void)
         mlc->out = &hp_sdc_mlc_out;
         mlc->priv = &hp_sdc_mlc_priv;
 
-        if (hil_mlc_register(mlc)) {
+        err = hil_mlc_register(mlc);
+        if (err) {
                 printk(KERN_WARNING PREFIX "Failed to register MLC structure with hil_mlc\n");
-                goto err0;
+                return err;
         }
 
         if (hp_sdc_request_hil_irq(&hp_sdc_mlc_isr)) {
                 printk(KERN_WARNING PREFIX "Request for raw HIL ISR hook denied\n");
-                goto err1;
+                if (hil_mlc_unregister(mlc))
+                        printk(KERN_ERR PREFIX "Failed to unregister MLC structure with hil_mlc.\n"
+                                "This is bad.  Could cause an oops.\n");
+                return -EBUSY;
         }
+
         return 0;
- err1:
-        if (hil_mlc_unregister(mlc))
-                printk(KERN_ERR PREFIX "Failed to unregister MLC structure with hil_mlc.\n"
-                        "This is bad.  Could cause an oops.\n");
- err0:
-        return -EBUSY;
 }
 
 static void __exit hp_sdc_mlc_exit(void)