Staging: sb105x: Fix a possible null dereference

This patch fixes the following error in sb_pc_mp.c-

drivers/staging/sb105x/sb_pci_mp.c:546 mp_startup() error: we previously assumed 'info->tty' could be null (see line 525)

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/sb105x/sb_pci_mp.c b/drivers/staging/sb105x/sb_pci_mp.c
index adb6bea..bc53b4e 100644 (file)
--- a/drivers/staging/sb105x/sb_pci_mp.c
+++ b/drivers/staging/sb105x/sb_pci_mp.c
@@ -543,14 +543,14 @@ static int mp_startup(struct sb_uart_state *state, int init_hw)
                if (init_hw) {
                        mp_change_speed(state, NULL);
 
-                       if (info->tty->termios.c_cflag & CBAUD)
+                       if (info->tty && (info->tty->termios.c_cflag & CBAUD))
                                uart_set_mctrl(port, TIOCM_RTS | TIOCM_DTR);
                }
 
                info->flags |= UIF_INITIALIZED;
 
-
-               clear_bit(TTY_IO_ERROR, &info->tty->flags);
+               if (info->tty)
+                       clear_bit(TTY_IO_ERROR, &info->tty->flags);
        }
 
        if (retval && capable(CAP_SYS_ADMIN))