Make sure to wake up any process sleeping on the modem-status-change queue at port remove. Currently a process waiting on modem status changes will not be woken on device disconnect. Note that we need to use the disconnected flag to detect disconnect as the port private data may have been freed when woken up. Cc: stable <stable@xxxxxxxxxxxxxxx> Signed-off-by: Johan Hovold <jhovold@xxxxxxxxx> --- drivers/usb/serial/f81232.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index b1b2dc6..414ac3a 100644 --- a/drivers/usb/serial/f81232.c +++ b/drivers/usb/serial/f81232.c @@ -261,6 +261,9 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg) if (signal_pending(current)) return -ERESTARTSYS; + if (port->serial->disconnected) + return -EIO; + spin_lock_irqsave(&priv->lock, flags); status = priv->line_status; spin_unlock_irqrestore(&priv->lock, flags); @@ -334,6 +337,7 @@ static int f81232_port_remove(struct usb_serial_port *port) struct f81232_private *priv; priv = usb_get_serial_port_data(port); + wake_up_interruptible(&priv->delta_msr_wait); kfree(priv); return 0; -- 1.8.1.1 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
