mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
tty: fix chars_in_buffers
This function does not have an error return and returning an error is instead interpreted as having a lot of pending bytes. Reported by Jeff Harris who provided a list of some of the remaining offenders. Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
254702568d
commit
23198fda71
7 changed files with 10 additions and 10 deletions
|
|
@ -750,7 +750,7 @@ static int acm_tty_chars_in_buffer(struct tty_struct *tty)
|
|||
{
|
||||
struct acm *acm = tty->driver_data;
|
||||
if (!ACM_READY(acm))
|
||||
return -EINVAL;
|
||||
return 0;
|
||||
/*
|
||||
* This is inaccurate (overcounts), but it works.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -521,7 +521,7 @@ static int mos7720_chars_in_buffer(struct tty_struct *tty)
|
|||
mos7720_port = usb_get_serial_port_data(port);
|
||||
if (mos7720_port == NULL) {
|
||||
dbg("%s:leaving ...........", __func__);
|
||||
return -ENODEV;
|
||||
return 0;
|
||||
}
|
||||
|
||||
for (i = 0; i < NUM_URBS; ++i) {
|
||||
|
|
|
|||
|
|
@ -727,7 +727,7 @@ static int ti_write_room(struct tty_struct *tty)
|
|||
dbg("%s - port %d", __func__, port->number);
|
||||
|
||||
if (tport == NULL)
|
||||
return -ENODEV;
|
||||
return 0;
|
||||
|
||||
spin_lock_irqsave(&tport->tp_lock, flags);
|
||||
room = ti_buf_space_avail(tport->tp_write_buf);
|
||||
|
|
@ -748,7 +748,7 @@ static int ti_chars_in_buffer(struct tty_struct *tty)
|
|||
dbg("%s - port %d", __func__, port->number);
|
||||
|
||||
if (tport == NULL)
|
||||
return -ENODEV;
|
||||
return 0;
|
||||
|
||||
spin_lock_irqsave(&tport->tp_lock, flags);
|
||||
chars = ti_buf_data_avail(tport->tp_write_buf);
|
||||
|
|
|
|||
Loading…
Reference in a new issue