openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hvc_dcc: don't ignore errors during initialization 

hvc_instantiate() and hvc_alloc() return errors if they fail, so don't
ignore them.

Signed-off-by: Timur Tabi <timur@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Timur Tabi 2015-09-12 12:44:38 -05:00 committed by Greg Kroah-Hartman
parent 9af92fbff3
commit 3d27070108
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/tty/hvc/hvc_dcc.c
View File

@ -70,20 +70,27 @@ static const struct hv_ops hvc_dcc_get_put_ops = {
static int __init hvc_dcc_console_init(void) static int __init hvc_dcc_console_init(void)
{ {
int ret;
if (!hvc_dcc_check()) if (!hvc_dcc_check())
return -ENODEV; return -ENODEV;
hvc_instantiate(0, 0, &hvc_dcc_get_put_ops); /* Returns -1 if error */
return 0; ret = hvc_instantiate(0, 0, &hvc_dcc_get_put_ops);
return ret < 0 ? -ENODEV : 0;
} }
console_initcall(hvc_dcc_console_init); console_initcall(hvc_dcc_console_init);
static int __init hvc_dcc_init(void) static int __init hvc_dcc_init(void)
{ {
struct hvc_struct *p;
if (!hvc_dcc_check()) if (!hvc_dcc_check())
return -ENODEV; return -ENODEV;
hvc_alloc(0, 0, &hvc_dcc_get_put_ops, 128); p = hvc_alloc(0, 0, &hvc_dcc_get_put_ops, 128);
return 0;
return PTR_ERR_OR_ZERO(p);
} }
device_initcall(hvc_dcc_init); device_initcall(hvc_dcc_init);