diff options
Diffstat (limited to 'tty.current/ip2-remove-unneeded-null-check.patch')
| -rw-r--r-- | tty.current/ip2-remove-unneeded-null-check.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/tty.current/ip2-remove-unneeded-null-check.patch b/tty.current/ip2-remove-unneeded-null-check.patch new file mode 100644 index 00000000000000..b56fd60a7a1fa4 --- /dev/null +++ b/tty.current/ip2-remove-unneeded-null-check.patch @@ -0,0 +1,33 @@ +From akpm@linux-foundation.org Thu Aug 19 10:33:35 2010 +Message-Id: <201008122048.o7CKmvB4011929@imap1.linux-foundation.org> +Subject: ip2: remove unneeded NULL check +To: mm-commits@vger.kernel.org +Cc: error27@gmail.com, greg@kroah.com, mhw@wittsend.com +From: Dan Carpenter <error27@gmail.com> +Date: Thu, 12 Aug 2010 13:48:57 -0700 + +From: Dan Carpenter <error27@gmail.com> + +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> + +--- + drivers/char/ip2/ip2main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- 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)); |