diff --git a/[refs] b/[refs]
index 35f92d5a3e2c..3a9c6bf6299b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fbedf67ed3ad2ee08b96cbc3c56c7d81db14de9
+refs/heads/master: 8441bf5e063e03e5d307ffb32fd5f77e81c0d397
diff --git a/trunk/drivers/staging/sb105x/sb_pci_mp.c b/trunk/drivers/staging/sb105x/sb_pci_mp.c
index 131afd0c460c..c34ebff6bb04 100644
--- a/trunk/drivers/staging/sb105x/sb_pci_mp.c
+++ b/trunk/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;