From 824f68bd5c06183dd78668983a05d64ace82aaa7 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Wed, 25 Apr 2012 15:56:29 +0200 Subject: [PATCH] --- yaml --- r: 303597 b: refs/heads/master c: 81d5a6729018ef18dcc1a555144ce91eb3c9abc4 h: refs/heads/master i: 303595: 2832aed1f0cb0995be676ab5269147eb940a8e39 v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/opticon.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d12b950ae38d..5e3363c8b322 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33f7a67e477f780b82ef36ce358f6d5290d6a9b2 +refs/heads/master: 81d5a6729018ef18dcc1a555144ce91eb3c9abc4 diff --git a/trunk/drivers/usb/serial/opticon.c b/trunk/drivers/usb/serial/opticon.c index 82cc9d202b83..d31e997ebd27 100644 --- a/trunk/drivers/usb/serial/opticon.c +++ b/trunk/drivers/usb/serial/opticon.c @@ -401,8 +401,6 @@ static int opticon_tiocmget(struct tty_struct *tty) int result = 0; dbg("%s - port %d", __func__, port->number); - if (!usb_get_intfdata(port->serial->interface)) - return -ENODEV; spin_lock_irqsave(&priv->lock, flags); if (priv->rts) @@ -419,13 +417,13 @@ static int opticon_tiocmset(struct tty_struct *tty, unsigned int set, unsigned int clear) { struct usb_serial_port *port = tty->driver_data; + struct usb_serial *serial = port->serial; struct opticon_private *priv = usb_get_serial_data(port->serial); unsigned long flags; bool rts; bool changed = false; + int ret; - if (!usb_get_intfdata(port->serial->interface)) - return -ENODEV; /* We only support RTS so we only handle that */ spin_lock_irqsave(&priv->lock, flags); @@ -441,7 +439,14 @@ static int opticon_tiocmset(struct tty_struct *tty, return 0; /* Send the new RTS state to the connected device */ - return send_control_msg(port, CONTROL_RTS, !rts); + mutex_lock(&serial->disc_mutex); + if (!serial->disconnected) + ret = send_control_msg(port, CONTROL_RTS, !rts); + else + ret = -ENODEV; + mutex_unlock(&serial->disc_mutex); + + return ret; } static int get_serial_info(struct opticon_private *priv,