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

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

USB: serial: fix generic chars_in_buffer 



Make sure chars_in_buffer accounts also for data in host stack queues.

This fixes the problem with tty_wait_until_sent returning too soon at
close which could cause the final write urb to be cancelled.

Reported-by: default avatarPete Zaitcev <zaitcev@redhat.com>
Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7919c2fd

drivers/usb/serial/generic.c

+11 −4
Original line number Diff line number Diff line
@@ -309,12 +309,16 @@ static int usb_serial_generic_write_start(struct usb_serial_port *port) 
		/* don't have to grab the lock here, as we will

		   retry if != 0 */

		port->write_urb_busy = 0;

	} else

		result = count;



		return result;

	}



	spin_lock_irqsave(&port->lock, flags);

	port->tx_bytes_flight += count;

	spin_unlock_irqrestore(&port->lock, flags);



	return count;

}



/**

 * usb_serial_generic_write - generic write function for serial USB devices

 * @tty:	Pointer to &struct tty_struct for the device
@@ -400,7 +404,7 @@ int usb_serial_generic_chars_in_buffer(struct tty_struct *tty) 
	if (serial->type->max_in_flight_urbs)

		chars = port->tx_bytes_flight;

	else

		chars = kfifo_len(&port->write_fifo);

		chars = kfifo_len(&port->write_fifo) + port->tx_bytes_flight;

	spin_unlock_irqrestore(&port->lock, flags);



	dbg("%s - returns %d", __func__, chars);
@@ -510,7 +514,10 @@ void usb_serial_generic_write_bulk_callback(struct urb *urb) 
			port->urbs_in_flight = 0;

		spin_unlock_irqrestore(&port->lock, flags);

	} else {

		spin_lock_irqsave(&port->lock, flags);

		port->tx_bytes_flight -= urb->transfer_buffer_length;

		port->write_urb_busy = 0;

		spin_unlock_irqrestore(&port->lock, flags);



		if (status)

			kfifo_reset_out(&port->write_fifo);