mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-24 21:24:00 +08:00
USB: serial: kl5kusb105: fix open error path
Kill urbs and disable read before returning from open on failure to
retrieve the line state.
Fixes: 1da177e4c3
("Linux-2.6.12-rc2")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
parent
0c9bd6004d
commit
6774d5f532
@ -296,7 +296,7 @@ static int klsi_105_open(struct tty_struct *tty, struct usb_serial_port *port)
|
||||
rc = usb_serial_generic_open(tty, port);
|
||||
if (rc) {
|
||||
retval = rc;
|
||||
goto exit;
|
||||
goto err_free_cfg;
|
||||
}
|
||||
|
||||
rc = usb_control_msg(port->serial->dev,
|
||||
@ -315,17 +315,32 @@ static int klsi_105_open(struct tty_struct *tty, struct usb_serial_port *port)
|
||||
dev_dbg(&port->dev, "%s - enabled reading\n", __func__);
|
||||
|
||||
rc = klsi_105_get_line_state(port, &line_state);
|
||||
if (rc >= 0) {
|
||||
spin_lock_irqsave(&priv->lock, flags);
|
||||
priv->line_state = line_state;
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
dev_dbg(&port->dev, "%s - read line state 0x%lx\n", __func__, line_state);
|
||||
retval = 0;
|
||||
} else
|
||||
if (rc < 0) {
|
||||
retval = rc;
|
||||
goto err_disable_read;
|
||||
}
|
||||
|
||||
exit:
|
||||
spin_lock_irqsave(&priv->lock, flags);
|
||||
priv->line_state = line_state;
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
dev_dbg(&port->dev, "%s - read line state 0x%lx\n", __func__,
|
||||
line_state);
|
||||
|
||||
return 0;
|
||||
|
||||
err_disable_read:
|
||||
usb_control_msg(port->serial->dev,
|
||||
usb_sndctrlpipe(port->serial->dev, 0),
|
||||
KL5KUSB105A_SIO_CONFIGURE,
|
||||
USB_TYPE_VENDOR | USB_DIR_OUT,
|
||||
KL5KUSB105A_SIO_CONFIGURE_READ_OFF,
|
||||
0, /* index */
|
||||
NULL, 0,
|
||||
KLSI_TIMEOUT);
|
||||
usb_serial_generic_close(port);
|
||||
err_free_cfg:
|
||||
kfree(cfg);
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user