diff --git a/[refs] b/[refs] index e7c50d3b0a05..a72d626a9298 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2aa92581fb13e04e1440e5041b412cc06c782e0e +refs/heads/master: 969dd061d81d9e2bc7f954859452ac81cc639711 diff --git a/trunk/drivers/char/cyclades.c b/trunk/drivers/char/cyclades.c index cc7acf877dc0..122e7a72a4e1 100644 --- a/trunk/drivers/char/cyclades.c +++ b/trunk/drivers/char/cyclades.c @@ -2833,9 +2833,8 @@ cy_write(struct tty_struct * tty, const unsigned char *buf, int count) return 0; } - if (!tty || !info->xmit_buf || !tmp_buf){ - return 0; - } + if (!info->xmit_buf || !tmp_buf) + return 0; CY_LOCK(info, flags); while (1) { @@ -2884,7 +2883,7 @@ cy_put_char(struct tty_struct *tty, unsigned char ch) if (serial_paranoia_check(info, tty->name, "cy_put_char")) return; - if (!tty || !info->xmit_buf) + if (!info->xmit_buf) return; CY_LOCK(info, flags);