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

Commit 37a80bf5 authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk
Browse files

xen/hvc: Fix up checks when the info is allocated. 



Coverity would complain about this - even thought it looks OK.

CID 401957
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 17f9b896

drivers/tty/hvc/hvc_xen.c

+6 −9
Original line number Diff line number Diff line
@@ -209,11 +209,10 @@ static int xen_hvm_console_init(void) 
		info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO);

		if (!info)

			return -ENOMEM;

	}



	} else if (info->intf != NULL) {

		/* already configured */

	if (info->intf != NULL)

		return 0;

	}

	/*

	 * If the toolstack (or the hypervisor) hasn't set these values, the

	 * default value is 0. Even though mfn = 0 and evtchn = 0 are
@@ -259,12 +258,10 @@ static int xen_pv_console_init(void) 
		info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO);

		if (!info)

			return -ENOMEM;

	}



	} else if (info->intf != NULL) {

		/* already configured */

	if (info->intf != NULL)

		return 0;



	}

	info->evtchn = xen_start_info->console.domU.evtchn;

	info->intf = mfn_to_virt(xen_start_info->console.domU.mfn);

	info->vtermno = HVC_COOKIE;