diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-05-23 12:55:38 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-22 11:36:53 -0700 |
| commit | 85fc3e3eba89272acb005f320ccafa0588a48f49 (patch) | |
| tree | e5797446f9a1167ef04d999d5577d78b65249c50 | |
| parent | 6a07cbc4ef9cea9f9eabc676fd6b8c03c11f51cc (diff) | |
xen/hvc: Fix error cases around HVM_PARAM_CONSOLE_PFN
commit a32c88b9386ce3df87f28dd46bdc3776cd6edf75 upstream.
We weren't resetting the parameter to be passed in to a
known default. Nor were we checking the return value of
hvm_get_parameter.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/hvc/hvc_xen.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c index afc7fc27aa52..3277f0eec4a7 100644 --- a/drivers/tty/hvc/hvc_xen.c +++ b/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; |