These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / tty / hvc / hvc_dcc.c

diff --git a/kernel/drivers/tty/hvc/hvc_dcc.c b/kernel/drivers/tty/hvc/hvc_dcc.c
index 809920d..82f240f 100644 (file)
--- a/kernel/drivers/tty/hvc/hvc_dcc.c
+++ b/kernel/drivers/tty/hvc/hvc_dcc.c
@@ -70,20 +70,27 @@ static const struct hv_ops hvc_dcc_get_put_ops = {
 
 static int __init hvc_dcc_console_init(void)
 {
+       int ret;
+
        if (!hvc_dcc_check())
                return -ENODEV;
 
-       hvc_instantiate(0, 0, &hvc_dcc_get_put_ops);
-       return 0;
+       /* Returns -1 if error */
+       ret = hvc_instantiate(0, 0, &hvc_dcc_get_put_ops);
+
+       return ret < 0 ? -ENODEV : 0;
 }
 console_initcall(hvc_dcc_console_init);
 
 static int __init hvc_dcc_init(void)
 {
+       struct hvc_struct *p;
+
        if (!hvc_dcc_check())
                return -ENODEV;
 
-       hvc_alloc(0, 0, &hvc_dcc_get_put_ops, 128);
-       return 0;
+       p = hvc_alloc(0, 0, &hvc_dcc_get_put_ops, 128);
+
+       return PTR_ERR_OR_ZERO(p);
 }
 device_initcall(hvc_dcc_init);