USB: serial: fix softint not being called on errors
Make sure usb_serial_port_softint is called on errors also when using multi urb writes. Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
0ae1474367
commit
6313620228
|
@ -500,23 +500,18 @@ void usb_serial_generic_write_bulk_callback(struct urb *urb)
|
||||||
if (port->urbs_in_flight < 0)
|
if (port->urbs_in_flight < 0)
|
||||||
port->urbs_in_flight = 0;
|
port->urbs_in_flight = 0;
|
||||||
spin_unlock_irqrestore(&port->lock, flags);
|
spin_unlock_irqrestore(&port->lock, flags);
|
||||||
|
|
||||||
if (status) {
|
|
||||||
dbg("%s - nonzero multi-urb write bulk status "
|
|
||||||
"received: %d", __func__, status);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
port->write_urb_busy = 0;
|
port->write_urb_busy = 0;
|
||||||
|
|
||||||
if (status) {
|
if (status)
|
||||||
dbg("%s - nonzero multi-urb write bulk status "
|
|
||||||
"received: %d", __func__, status);
|
|
||||||
kfifo_reset_out(&port->write_fifo);
|
kfifo_reset_out(&port->write_fifo);
|
||||||
} else
|
else
|
||||||
usb_serial_generic_write_start(port);
|
usb_serial_generic_write_start(port);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (status)
|
||||||
|
dbg("%s - non-zero urb status: %d", __func__, status);
|
||||||
|
|
||||||
usb_serial_port_softint(port);
|
usb_serial_port_softint(port);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(usb_serial_generic_write_bulk_callback);
|
EXPORT_SYMBOL_GPL(usb_serial_generic_write_bulk_callback);
|
||||||
|
|
Loading…
Reference in a new issue