diff options
| -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) | |||
| 209 | info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO); | 209 | info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO); |
| 210 | if (!info) | 210 | if (!info) |
| 211 | return -ENOMEM; | 211 | return -ENOMEM; |
| 212 | } | 212 | } else if (info->intf != NULL) { |
| 213 | 213 | /* already configured */ | |
| 214 | /* already configured */ | ||
| 215 | if (info->intf != NULL) | ||
| 216 | return 0; | 214 | return 0; |
| 215 | } | ||
| 217 | /* | 216 | /* |
| 218 | * If the toolstack (or the hypervisor) hasn't set these values, the | 217 | * If the toolstack (or the hypervisor) hasn't set these values, the |
| 219 | * default value is 0. Even though mfn = 0 and evtchn = 0 are | 218 | * default value is 0. Even though mfn = 0 and evtchn = 0 are |
| @@ -259,12 +258,10 @@ static int xen_pv_console_init(void) | |||
| 259 | info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO); | 258 | info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO); |
| 260 | if (!info) | 259 | if (!info) |
| 261 | return -ENOMEM; | 260 | return -ENOMEM; |
| 262 | } | 261 | } else if (info->intf != NULL) { |
| 263 | 262 | /* already configured */ | |
| 264 | /* already configured */ | ||
| 265 | if (info->intf != NULL) | ||
| 266 | return 0; | 263 | return 0; |
| 267 | 264 | } | |
| 268 | info->evtchn = xen_start_info->console.domU.evtchn; | 265 | info->evtchn = xen_start_info->console.domU.evtchn; |
| 269 | info->intf = mfn_to_virt(xen_start_info->console.domU.mfn); | 266 | info->intf = mfn_to_virt(xen_start_info->console.domU.mfn); |
| 270 | info->vtermno = HVC_COOKIE; | 267 | info->vtermno = HVC_COOKIE; |