summaryrefslogtreecommitdiffstats
path: root/drivers/serial/jsm/jsm_neo.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-03-09 15:21:57 +0100
committerTakashi Iwai <tiwai@suse.de>2009-03-09 15:21:57 +0100
commitefdcd41b4e41560375bb34ad8b095bcaa1c3a93f (patch)
tree57200ef68bae530776c0c2621c51e9464e1e72f9 /drivers/serial/jsm/jsm_neo.c
parent33dbe6114047496a5b6fee0941c52dad41250043 (diff)
parent79c7cdd5441f5d3900c1632adcc8cd2bee35c8da (diff)
downloadtalos-op-linux-efdcd41b4e41560375bb34ad8b095bcaa1c3a93f.tar.gz
talos-op-linux-efdcd41b4e41560375bb34ad8b095bcaa1c3a93f.zip
Merge branch 'topic/vmaster-update' into topic/docbook-fix
Diffstat (limited to 'drivers/serial/jsm/jsm_neo.c')
-rw-r--r--drivers/serial/jsm/jsm_neo.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/serial/jsm/jsm_neo.c
index b7584ca55ade..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;
OpenPOWER on IntegriCloud