X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=drivers%2Fserial%2Fjsm%2Fjsm_neo.c;h=e6390d023634ce978beced44b34299656b846faa;hb=67fcdead3c7424d51e7108c220c9ab1a5e752ed3;hp=b2d6f5b1a7c2c3c4fc21b4ecb8e4f31008f050a4;hpb=36f021b579d195cdc5fa6f3e2bab198b4bf70643;p=cascardo%2Flinux.git

diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/serial/jsm/jsm_neo.c
index b2d6f5b1a7c2..e6390d023634 100644
--- a/drivers/serial/jsm/jsm_neo.c
+++ b/drivers/serial/jsm/jsm_neo.c
@@ -577,9 +577,6 @@ static void neo_parse_modem(struct jsm_channel *ch, u8 signals)
 	jsm_printk(MSIGS, INFO, &ch->ch_bd->pci_dev,
 			"neo_parse_modem: port: %d msignals: %x\n", ch->ch_portnum, msignals);
 
-	if (!ch)
-		return;
-
 	/* Scrub off lower bits. They signify delta's, which I don't care about */
 	/* Keep DDCD and DDSR though */
 	msignals &= 0xf8;
@@ -998,7 +995,7 @@ static void neo_param(struct jsm_channel *ch)
 			{     50, B50     },
 		};
 
-		cflag = C_BAUD(ch->uart_port.info->tty);
+		cflag = C_BAUD(ch->uart_port.info->port.tty);
 		baud = 9600;
 		for (i = 0; i < ARRAY_SIZE(baud_rates); i++) {
 			if (baud_rates[i].cflag == cflag) {