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

Commit 2e5ad6b9 authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk
Browse files

xen/hvc: Collapse error logic. 



All of the error paths are doing the same logic. In which
case we might as well collapse them in one path.

CC: stable@kernel.org
Acked-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 68c2c39a

drivers/tty/hvc/hvc_xen.c

+9 −12
Original line number Diff line number Diff line
@@ -216,22 +216,16 @@ static int xen_hvm_console_init(void) 
		return 0;



	r = hvm_get_parameter(HVM_PARAM_CONSOLE_EVTCHN, &v);

	if (r < 0) {

		kfree(info);

		return -ENODEV;

	}

	if (r < 0)

		goto err;

	info->evtchn = v;

	hvm_get_parameter(HVM_PARAM_CONSOLE_PFN, &v);

	if (r < 0) {

		kfree(info);

		return -ENODEV;

	}

	if (r < 0)

		goto err;

	mfn = v;

	info->intf = ioremap(mfn << PAGE_SHIFT, PAGE_SIZE);

	if (info->intf == NULL) {

		kfree(info);

		return -ENODEV;

	}

	if (info->intf == NULL)

		goto err;

	info->vtermno = HVC_COOKIE;



	spin_lock(&xencons_lock);
@@ -239,6 +233,9 @@ static int xen_hvm_console_init(void) 
	spin_unlock(&xencons_lock);



	return 0;

err:

	kfree(info);

	return -ENODEV;

}



static int xen_pv_console_init(void)