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

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

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: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0ae14743

drivers/usb/serial/generic.c

+5 −10
Original line number Diff line number Diff line
@@ -500,23 +500,18 @@ void usb_serial_generic_write_bulk_callback(struct urb *urb) 
		if (port->urbs_in_flight < 0)

			port->urbs_in_flight = 0;

		spin_unlock_irqrestore(&port->lock, flags);



		if (status) {

			dbg("%s - nonzero multi-urb write bulk status "

				"received: %d", __func__, status);

			return;

		}

	} else {

		port->write_urb_busy = 0;



		if (status) {

			dbg("%s - nonzero multi-urb write bulk status "

				"received: %d", __func__, status);

		if (status)

			kfifo_reset_out(&port->write_fifo);

		} else

		else

			usb_serial_generic_write_start(port);

	}



	if (status)

		dbg("%s - non-zero urb status: %d", __func__, status);



	usb_serial_port_softint(port);

}

EXPORT_SYMBOL_GPL(usb_serial_generic_write_bulk_callback);