From c4204fa39a301b33722d9079ff2972b00630893b Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 23 May 2012 12:55:38 -0400
Subject: [PATCH] --- yaml --- r: 310925 b: refs/heads/master c:
 a32c88b9386ce3df87f28dd46bdc3776cd6edf75 h: refs/heads/master i:   310923:
 2a0fee46344fccab771180d82bfa65a447acc318 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/tty/hvc/hvc_xen.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cde368a89b21..89d0a4efc0fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e5ad6b9c45d43cc4e7b8ac5ded1c55a7c4a3893
+refs/heads/master: a32c88b9386ce3df87f28dd46bdc3776cd6edf75
diff --git a/trunk/drivers/tty/hvc/hvc_xen.c b/trunk/drivers/tty/hvc/hvc_xen.c
index afc7fc27aa52..3277f0eec4a7 100644
--- a/trunk/drivers/tty/hvc/hvc_xen.c
+++ b/trunk/drivers/tty/hvc/hvc_xen.c
@@ -219,7 +219,8 @@ static int xen_hvm_console_init(void)
 	if (r < 0)
 		goto err;
 	info->evtchn = v;
-	hvm_get_parameter(HVM_PARAM_CONSOLE_PFN, &v);
+	v = 0;
+	r = hvm_get_parameter(HVM_PARAM_CONSOLE_PFN, &v);
 	if (r < 0)
 		goto err;
 	mfn = v;