Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/xen/mcelog.c

+18 −7
Original line number Diff line number Diff line
@@ -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))

	if (!xen_initial_domain())

		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);