From ba32dadee0310e0834d357968a56595d7ab2e5ce Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 3 Jan 2013 15:53:40 +0100 Subject: [PATCH] --- yaml --- r: 354775 b: refs/heads/master c: fa47ba75ec2d5818d7aeeb540e738827c4b69194 h: refs/heads/master i: 354773: 9af5183e5e14427ee7066b24f418e395ff959ec6 354771: 242038f8d7881ce89d97fa85ad7349bd3bf2e8ca 354767: ae186717cad203d333378da5af7e6b763fc9a1af v: v3 --- [refs] | 2 +- trunk/drivers/tty/nozomi.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 5204a3cabaf3..3bff6cd090f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc5ab61086334e72afdf970c032fecf5e5fcf7ca +refs/heads/master: fa47ba75ec2d5818d7aeeb540e738827c4b69194 diff --git a/trunk/drivers/tty/nozomi.c b/trunk/drivers/tty/nozomi.c index afdd7732d925..2dff19796157 100644 --- a/trunk/drivers/tty/nozomi.c +++ b/trunk/drivers/tty/nozomi.c @@ -1679,12 +1679,6 @@ static int ntty_write(struct tty_struct *tty, const unsigned char *buffer, rval = kfifo_in(&port->fifo_ul, (unsigned char *)buffer, count); - /* notify card */ - if (unlikely(dc == NULL)) { - DBG1("No device context?"); - goto exit; - } - spin_lock_irqsave(&dc->spin_mutex, flags); /* CTS is only valid on the modem channel */ if (port == &(dc->port[PORT_MDM])) { @@ -1700,7 +1694,6 @@ static int ntty_write(struct tty_struct *tty, const unsigned char *buffer, } spin_unlock_irqrestore(&dc->spin_mutex, flags); -exit: return rval; }