summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-08-12 13:48:57 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-23 18:17:20 -0700
commitf64ac9830b2a2455208ee023f6bac480ae159db4 (patch)
treec91728532925b176ceb970f3278e5c267e3b669c /drivers/char
parent07cda511c78db79974f56b277b3704bfc6bba711 (diff)
downloadlinux-3.10-f64ac9830b2a2455208ee023f6bac480ae159db4.tar.gz
linux-3.10-f64ac9830b2a2455208ee023f6bac480ae159db4.tar.bz2
linux-3.10-f64ac9830b2a2455208ee023f6bac480ae159db4.zip
ip2: remove unneeded NULL check
We don't pass NULL tty pointers to the close function, and anyway we already dereferenced it at this point. This check can be removed. Signed-off-by: Dan Carpenter <error27@gmail.com> Cc: "Michael H. Warfield" <mhw@wittsend.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/ip2/ip2main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index 07f3ea38b58..8fa041eb844 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -1650,7 +1650,7 @@ ip2_close( PTTY tty, struct file *pFile )
/* disable DSS reporting */
i2QueueCommands(PTYPE_INLINE, pCh, 100, 4,
CMD_DCD_NREP, CMD_CTS_NREP, CMD_DSR_NREP, CMD_RI_NREP);
- if ( !tty || (tty->termios->c_cflag & HUPCL) ) {
+ if (tty->termios->c_cflag & HUPCL) {
i2QueueCommands(PTYPE_INLINE, pCh, 100, 2, CMD_RTSDN, CMD_DTRDN);
pCh->dataSetOut &= ~(I2_DTR | I2_RTS);
i2QueueCommands( PTYPE_INLINE, pCh, 100, 1, CMD_PAUSE(25));