From 131ccc2e74ea42328d66c67bd7f9e993e48e2fdb Mon Sep 17 00:00:00 2001 From: Rashika Kheria Date: Sat, 19 Oct 2013 23:05:01 +0530 Subject: Staging: sb105x: Remove redundant null check This patch fixes the following Sparse information in sb_pci_mp.c- ~/git/kernels/linux/drivers/staging/sb105x/sb_pci_mp.c:1813 mp_unregister_driver() info: redundant null check on drv->state calling kfree() Signed-off-by: Rashika Kheria Reviewed-by: Josh Triplett Signed-off-by: Greg Kroah-Hartman --- drivers/staging/sb105x/sb_pci_mp.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'drivers/staging/sb105x/sb_pci_mp.c') diff --git a/drivers/staging/sb105x/sb_pci_mp.c b/drivers/staging/sb105x/sb_pci_mp.c index 23db32f07fd5..adb6bea728b2 100644 --- a/drivers/staging/sb105x/sb_pci_mp.c +++ b/drivers/staging/sb105x/sb_pci_mp.c @@ -1808,10 +1808,7 @@ void mp_unregister_driver(struct uart_driver *drv) drv->tty_driver = NULL; - if (drv->state) - { - kfree(drv->state); - } + kfree(drv->state); } -- cgit v1.2.3 From 7c64884b19f3dc864208df30c0a9c24175dac26a Mon Sep 17 00:00:00 2001 From: Rashika Kheria Date: Sun, 20 Oct 2013 18:29:55 +0530 Subject: 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 Reviewed-by: Josh Triplett Signed-off-by: Greg Kroah-Hartman --- drivers/staging/sb105x/sb_pci_mp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/staging/sb105x/sb_pci_mp.c') diff --git a/drivers/staging/sb105x/sb_pci_mp.c b/drivers/staging/sb105x/sb_pci_mp.c index adb6bea728b2..bc53b4ef1e61 100644 --- 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)) -- cgit v1.2.3 From 41f7ba7a9ba711f6e3f0b4ef73f9bb49f17e2f75 Mon Sep 17 00:00:00 2001 From: Lisa Nguyen Date: Sun, 27 Oct 2013 23:36:20 -0700 Subject: staging: sb105x: Remove unneeded semicolon in sb_pci_mp.c Remove unneeded semicolon in sb_pci_mp.c to meet kernel coding style. Signed-off-by: Lisa Nguyen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/sb105x/sb_pci_mp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/staging/sb105x/sb_pci_mp.c') diff --git a/drivers/staging/sb105x/sb_pci_mp.c b/drivers/staging/sb105x/sb_pci_mp.c index bc53b4ef1e61..11c047e3a901 100644 --- a/drivers/staging/sb105x/sb_pci_mp.c +++ b/drivers/staging/sb105x/sb_pci_mp.c @@ -1216,7 +1216,7 @@ static int mp_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) return (inb(mp_devs[arg].option_reg_addr+MP_OPTR_IIR0+(state->port->line/8))); } case TIOCGGETPORTTYPE: - ret = get_device_type(arg);; + ret = get_device_type(arg); return ret; case TIOCSMULTIECHO: /* set to multi-drop mode(RS422) or echo mode(RS485)*/ outb( ( inb(info->interface_config_addr) & ~0x03 ) | 0x01 , -- cgit v1.2.3