Merge remote branch 'origin/master' of ../linux-2.6 into drm-next

[firefly-linux-kernel-4.4.55.git] / drivers / char / nozomi.c

diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c
index 280b41c507a723b12a62560f67d325151cbf979d..ec58d8c387ff2303f67db428622f68b7eff76057 100644 (file)
--- a/drivers/char/nozomi.c
+++ b/drivers/char/nozomi.c
@@ -1866,16 +1866,14 @@ static s32 ntty_chars_in_buffer(struct tty_struct *tty)
 {
        struct port *port = tty->driver_data;
        struct nozomi *dc = get_dc_by_tty(tty);
-       s32 rval;
+       s32 rval = 0;
 
        if (unlikely(!dc || !port)) {
-               rval = -ENODEV;
                goto exit_in_buffer;
        }
 
        if (unlikely(!port->port.count)) {
                dev_err(&dc->pdev->dev, "No tty open?\n");
-               rval = -ENODEV;
                goto exit_in_buffer;
        }