Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd58c7bd authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: serial: continue to write on errors 



Do not discard buffered data and make sure to try to resubmit the write
urbs on errors.

Currently a recoverable error would lead to more data than necessary
being dropped.

Also upgrade error messages from debug to error log level.

Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent fc11efe2

drivers/usb/serial/generic.c

+19 −10
Original line number Diff line number Diff line
@@ -397,7 +397,6 @@ void usb_serial_generic_write_bulk_callback(struct urb *urb) 
{

	unsigned long flags;

	struct usb_serial_port *port = urb->context;

	int status = urb->status;

	int i;



	for (i = 0; i < ARRAY_SIZE(port->write_urbs); ++i)
@@ -409,17 +408,27 @@ void usb_serial_generic_write_bulk_callback(struct urb *urb) 
	set_bit(i, &port->write_urbs_free);

	spin_unlock_irqrestore(&port->lock, flags);



	if (status) {

		dev_dbg(&port->dev, "%s - non-zero urb status: %d\n",

			__func__, status);



		spin_lock_irqsave(&port->lock, flags);

		kfifo_reset_out(&port->write_fifo);

		spin_unlock_irqrestore(&port->lock, flags);

	} else {

		usb_serial_generic_write_start(port, GFP_ATOMIC);

	switch (urb->status) {

	case 0:

		break;

	case -ENOENT:

	case -ECONNRESET:

	case -ESHUTDOWN:

		dev_dbg(&port->dev, "%s - urb stopped: %d\n",

							__func__, urb->status);

		return;

	case -EPIPE:

		dev_err_console(port, "%s - urb stopped: %d\n",

							__func__, urb->status);

		return;

	default:

		dev_err_console(port, "%s - nonzero urb status: %d\n",

							__func__, urb->status);

		goto resubmit;

	}



resubmit:

	usb_serial_generic_write_start(port, GFP_ATOMIC);

	usb_serial_port_softint(port);

}

EXPORT_SYMBOL_GPL(usb_serial_generic_write_bulk_callback);