Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux

[deliverable/linux.git] / drivers / char / hvc_iucv.c

diff --git a/drivers/char/hvc_iucv.c b/drivers/char/hvc_iucv.c
index 7b01bc609de3497cb0a17c4748d28a57e936e498..c3425bb3a1f6fe2348330d8336c76fd3b60d4b90 100644 (file)
--- a/drivers/char/hvc_iucv.c
+++ b/drivers/char/hvc_iucv.c
@@ -1303,13 +1303,11 @@ static int __init hvc_iucv_init(void)
        if (rc) {
                pr_err("Registering IUCV handlers failed with error code=%d\n",
                        rc);
-               goto out_error_iucv;
+               goto out_error_hvc;
        }
 
        return 0;
 
-out_error_iucv:
-       iucv_unregister(&hvc_iucv_handler, 0);
 out_error_hvc:
        for (i = 0; i < hvc_iucv_devices; i++)
                if (hvc_iucv_table[i])