Skip to content

Commit

Permalink
tty: fix some bogns in the serqt_usb2 driver
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alan Cox authored and Linus Torvalds committed Jun 22, 2009
1 parent a6540f7 commit 94362fd
Showing 1 changed file with 10 additions and 19 deletions.
29 changes: 10 additions & 19 deletions drivers/staging/serqt_usb2/serqt_usb2.c
Original file line number Diff line number Diff line change
Expand Up @@ -284,21 +284,12 @@ static void ProcessModemStatus(struct quatech_port *qt_port,
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;
tty = tty_port_tty_get(&port->port);

/* 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;
if (urb->actual_length)
tty_insert_flip_char(tty, data, TTY_NORMAL);
}

static void qt_write_bulk_callback(struct urb *urb)
Expand Down Expand Up @@ -435,19 +426,19 @@ static void qt_read_bulk_callback(struct urb *urb)
case 0xff:
dbg("No status sequence. \n");

ProcessRxChar(port, data[i]);
ProcessRxChar(port, data[i + 1]);
if (tty) {
ProcessRxChar(tty, port, data[i]);
ProcessRxChar(tty, port, data[i + 1]);
}
i += 2;
break;
}
if (flag == 1)
continue;
}

if (tty && urb->actual_length) {
tty_buffer_request_room(tty, 1);
tty_insert_flip_string(tty, (data + i), 1);
}
if (tty && urb->actual_length)
tty_insert_flip_char(tty, data[i], TTY_NORMAL);

}
tty_flip_buffer_push(tty);
Expand Down

0 comments on commit 94362fd

Please sign in to comment.