Merge branch 'jejb-fixes' into fixes

[karo-tx-linux.git] / drivers / xen / mcelog.c

diff --git a/drivers/xen/mcelog.c b/drivers/xen/mcelog.c
index 6ab6a79c38a5a9efc930e5c958cd60bb8e5c20dc..a493c7315e94007f2a621f037e83a34bce7e7a47 100644 (file)
--- a/drivers/xen/mcelog.c
+++ b/drivers/xen/mcelog.c
@@ -393,14 +393,25 @@ static int bind_virq_for_mce(void)
 
 static int __init xen_late_init_mcelog(void)
 {
+       int ret;
+
        /* Only DOM0 is responsible for MCE logging */
-       if (xen_initial_domain()) {
-               /* register character device /dev/mcelog for xen mcelog */
-               if (misc_register(&xen_mce_chrdev_device))
-                       return -ENODEV;
-               return bind_virq_for_mce();
-       }
+       if (!xen_initial_domain())
+               return -ENODEV;
+
+       /* register character device /dev/mcelog for xen mcelog */
+       ret = misc_register(&xen_mce_chrdev_device);
+       if (ret)
+               return ret;
+
+       ret = bind_virq_for_mce();
+       if (ret)
+               goto deregister;
 
-       return -ENODEV;
+       return 0;
+
+deregister:
+       misc_deregister(&xen_mce_chrdev_device);
+       return ret;
 }
 device_initcall(xen_late_init_mcelog);