aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/sb105x
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-01-09 10:10:59 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-17 16:43:20 -0800
commit8441bf5e063e03e5d307ffb32fd5f77e81c0d397 (patch)
tree0171af80aa59c11eebf66ff43cbec41fac84aae7 /drivers/staging/sb105x
parent2fbedf67ed3ad2ee08b96cbc3c56c7d81db14de9 (diff)
staging: sb105x: move dereference under IS_ERR() check
Avoid dereverencing the ERR_PTR() by shifting the dereference down a couple lines. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/sb105x')
-rw-r--r--drivers/staging/sb105x/sb_pci_mp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/sb105x/sb_pci_mp.c b/drivers/staging/sb105x/sb_pci_mp.c
index 131afd0c460..c34ebff6bb0 100644
--- a/drivers/staging/sb105x/sb_pci_mp.c
+++ b/drivers/staging/sb105x/sb_pci_mp.c
@@ -1563,13 +1563,13 @@ static int mp_open(struct tty_struct *tty, struct file *filp)
state = uart_get(drv, line);
- mtpt = (struct mp_port *)state->port;
-
if (IS_ERR(state)) {
retval = PTR_ERR(state);
goto fail;
}
+ mtpt = (struct mp_port *)state->port;
+
tty->driver_data = state;
tty->low_latency = (state->port->flags & UPF_LOW_LATENCY) ? 1 : 0;
tty->alt_speed = 0;