USB: kl5kusb105 don't flush to logically disconnected devices
If disconnect() is called for a logical disconnect, no more IO must be done after disconnect() returns, or the old and new drivers may conflict. This patch avoids this by using the flag and lock introduced by the earlier patch for the mos7720 driver. Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
b0a239da17
commit
3edbc98650
1 changed files with 15 additions and 11 deletions
|
@ -461,17 +461,21 @@ static void klsi_105_close (struct usb_serial_port *port, struct file *filp)
|
|||
|
||||
dbg("%s port %d", __FUNCTION__, port->number);
|
||||
|
||||
/* send READ_OFF */
|
||||
rc = 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);
|
||||
if (rc < 0)
|
||||
err("Disabling read failed (error = %d)", rc);
|
||||
mutex_lock(&port->serial->disc_mutex);
|
||||
if (!port->serial->disconnected) {
|
||||
/* send READ_OFF */
|
||||
rc = 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);
|
||||
if (rc < 0)
|
||||
err("Disabling read failed (error = %d)", rc);
|
||||
}
|
||||
mutex_unlock(&port->serial->disc_mutex);
|
||||
|
||||
/* shutdown our bulk reads and writes */
|
||||
usb_kill_urb(port->write_urb);
|
||||
|
|
Loading…
Add table
Reference in a new issue