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>

diff --git a/drivers/tty/hvc/hvc_dcc.c b/drivers/tty/hvc/hvc_dcc.c
index 809920d80a66da7c08f8cd653451fa2fdcec636e..82f240fb98f00e8493c68cd331fa95a2d9be57da 100644 (file)
--- a/drivers/tty/hvc/hvc_dcc.c
+++ b/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);