Commit ebfe79a7 authored by Dan Carpenter's avatar Dan Carpenter Committed by David Vrabel

xen/mce: fix up xen_late_init_mcelog() error handling

Static checkers complain about the missing call to misc_deregister() if
bind_virq_for_mce() fails.

Also I reversed the tests so that we do error handling instead of
success handling.  That way we just have a series of function calls
instead of the more complicated nested if statements in the original
code.  Let's preserve the error codes as well.
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
parent 4e8c0c8c
...@@ -393,14 +393,25 @@ static int bind_virq_for_mce(void) ...@@ -393,14 +393,25 @@ static int bind_virq_for_mce(void)
static int __init xen_late_init_mcelog(void) static int __init xen_late_init_mcelog(void)
{ {
int ret;
/* Only DOM0 is responsible for MCE logging */ /* Only DOM0 is responsible for MCE logging */
if (xen_initial_domain()) { if (!xen_initial_domain())
/* register character device /dev/mcelog for xen mcelog */
if (misc_register(&xen_mce_chrdev_device))
return -ENODEV; return -ENODEV;
return bind_virq_for_mce();
}
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 0;
deregister:
misc_deregister(&xen_mce_chrdev_device);
return ret;
} }
device_initcall(xen_late_init_mcelog); device_initcall(xen_late_init_mcelog);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment