diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-06-26 09:30:51 -0400 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-07-19 15:51:42 -0400 |
| commit | 37a80bf560786d96c5e8370bff45d867e43fd5c3 (patch) | |
| tree | 7258fe92388dcd7a7d601d819c9e126106e002a8 /drivers/tty/hvc | |
| parent | 17f9b896b06d314da890174584278dea8da7e0ce (diff) | |
| download | linux-stable-37a80bf560786d96c5e8370bff45d867e43fd5c3.tar.gz linux-stable-37a80bf560786d96c5e8370bff45d867e43fd5c3.tar.bz2 linux-stable-37a80bf560786d96c5e8370bff45d867e43fd5c3.zip | |
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: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/tty/hvc')
| -rw-r--r-- | drivers/tty/hvc/hvc_xen.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c index 944eaeb8e0cf..1e456dca4f60 100644 --- a/drivers/tty/hvc/hvc_xen.c +++ b/drivers/tty/hvc/hvc_xen.c @@ -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; - } - - /* already configured */ - if (info->intf != NULL) + } else if (info->intf != NULL) { + /* already configured */ 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; - } - - /* already configured */ - if (info->intf != NULL) + } else if (info->intf != NULL) { + /* already configured */ 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; |