summaryrefslogtreecommitdiffstats
path: root/drivers/char/synclink.c
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2010-01-10 12:30:16 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-02 14:43:16 -0800
commitca1cce49c2778439d00bbf516f70386f3d3b71e5 (patch)
tree637225c572d045b9273c8239d211326d314f5019 /drivers/char/synclink.c
parente6c4ef984ebbd1a0458503417da91f3de47cbbe0 (diff)
downloadtalos-op-linux-ca1cce49c2778439d00bbf516f70386f3d3b71e5.tar.gz
talos-op-linux-ca1cce49c2778439d00bbf516f70386f3d3b71e5.zip
Char: synclink, remove unnecessary checks
Stanse found a potential null dereference in mgsl_put_char and mgsl_write. There is a check for tty being NULL, but it is dereferenced earlier. Actually, tty cannot be NULL in .write and .put_char, so remove the tests. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char/synclink.c')
-rw-r--r--drivers/char/synclink.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index 4846b73ef28d..0658fc548222 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -2031,7 +2031,7 @@ static int mgsl_put_char(struct tty_struct *tty, unsigned char ch)
if (mgsl_paranoia_check(info, tty->name, "mgsl_put_char"))
return 0;
- if (!tty || !info->xmit_buf)
+ if (!info->xmit_buf)
return 0;
spin_lock_irqsave(&info->irq_spinlock, flags);
@@ -2121,7 +2121,7 @@ static int mgsl_write(struct tty_struct * tty,
if (mgsl_paranoia_check(info, tty->name, "mgsl_write"))
goto cleanup;
- if (!tty || !info->xmit_buf)
+ if (!info->xmit_buf)
goto cleanup;
if ( info->params.mode == MGSL_MODE_HDLC ||
OpenPOWER on IntegriCloud