From: Johan Hovold Date: Wed, 25 Apr 2012 13:56:30 +0000 (+0200) Subject: USB: oti6858: fix abuse of interface data X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1c5176692457c3f249559d29a69affad7447b326;p=deliverable%2Flinux.git USB: oti6858: fix abuse of interface data Fix abuse of interface data which was used to signal device disconnect. Note that neither tiocmset or tiocmget need to check for disconnect as they do not access the device. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c index 5fdc33c6a3c0..8bc8ea45825b 100644 --- a/drivers/usb/serial/oti6858.c +++ b/drivers/usb/serial/oti6858.c @@ -633,9 +633,6 @@ static int oti6858_tiocmset(struct tty_struct *tty, dbg("%s(port = %d, set = 0x%08x, clear = 0x%08x)", __func__, port->number, set, clear); - if (!usb_get_intfdata(port->serial->interface)) - return -ENODEV; - /* FIXME: check if this is correct (active high/low) */ spin_lock_irqsave(&priv->lock, flags); control = priv->pending_setup.control; @@ -665,9 +662,6 @@ static int oti6858_tiocmget(struct tty_struct *tty) dbg("%s(port = %d)", __func__, port->number); - if (!usb_get_intfdata(port->serial->interface)) - return -ENODEV; - spin_lock_irqsave(&priv->lock, flags); pin_state = priv->status.pin_state & PIN_MASK; spin_unlock_irqrestore(&priv->lock, flags);