kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tty: fix some bogns in the serqt_usb2 driver

Browse source 
Remove the replicated urban legends from the comments and fix a couple of
other silly calls

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alan Cox 2009-06-22 18:42:36 +01:00 committed by Linus Torvalds
parent a6540f731d
commit 94362fd7fb
1 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
drivers/staging/serqt_usb2/serqt_usb2.c
View file

@ -284,21 +284,12 @@ static void ProcessModemStatus(struct quatech_port *qt_port,
return; return;
} }
static void ProcessRxChar(struct usb_serial_port *port, unsigned char Data) static void ProcessRxChar(struct tty_struct *tty, struct usb_serial_port *port,
unsigned char data)
{ {
struct tty_struct *tty;
struct urb *urb = port->read_urb; struct urb *urb = port->read_urb;
tty = tty_port_tty_get(&port->port); if (urb->actual_length)
tty_insert_flip_char(tty, data, TTY_NORMAL);
/* if we insert more than TTY_FLIPBUF_SIZE characters, we drop them. */
if (tty && urb->actual_length) {
tty_buffer_request_room(tty, 1);
tty_insert_flip_string(tty, &Data, 1);
/* tty_flip_buffer_push(tty); */
}
return;
} }
static void qt_write_bulk_callback(struct urb *urb) static void qt_write_bulk_callback(struct urb *urb)
@ -435,8 +426,10 @@ static void qt_read_bulk_callback(struct urb *urb)
case 0xff: case 0xff:
dbg("No status sequence. \n"); dbg("No status sequence. \n");
ProcessRxChar(port, data[i]); if (tty) {
ProcessRxChar(port, data[i + 1]); ProcessRxChar(tty, port, data[i]);
ProcessRxChar(tty, port, data[i + 1]);
}
i += 2; i += 2;
break; break;
} }
@ -444,10 +437,8 @@ static void qt_read_bulk_callback(struct urb *urb)
continue; continue;
} }
if (tty && urb->actual_length) { if (tty && urb->actual_length)
tty_buffer_request_room(tty, 1); tty_insert_flip_char(tty, data[i], TTY_NORMAL);
tty_insert_flip_string(tty, (data + i), 1);
}
} }
tty_flip_buffer_push(tty); tty_flip_buffer_push(tty);