Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 195347
b: refs/heads/master
c: 2db6c76
h: refs/heads/master
i:
  195345: 7c8d6e8
  195343: 04ef8b6
v: v3
  • Loading branch information
Johan Hovold authored and Greg Kroah-Hartman committed May 20, 2010
1 parent 87c981f commit 597df47
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 056afc0f01701c4c779ac5b4f2dd9058063f337c
refs/heads/master: 2db6c7698bbb37128959d3a207fc46e3f45bef3c
16 changes: 2 additions & 14 deletions trunk/drivers/usb/serial/cp210x.c
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,6 @@ static unsigned int cp210x_quantise_baudrate(unsigned int baud) {

static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port)
{
struct usb_serial *serial = port->serial;
int result;

dbg("%s - port %d", __func__, port->number);
Expand All @@ -383,20 +382,9 @@ static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port)
return -EPROTO;
}

/* Start reading from the device */
usb_fill_bulk_urb(port->read_urb, serial->dev,
usb_rcvbulkpipe(serial->dev,
port->bulk_in_endpointAddress),
port->read_urb->transfer_buffer,
port->read_urb->transfer_buffer_length,
serial->type->read_bulk_callback,
port);
result = usb_submit_urb(port->read_urb, GFP_KERNEL);
if (result) {
dev_err(&port->dev, "%s - failed resubmitting read urb, "
"error %d\n", __func__, result);
result = usb_serial_generic_submit_read_urb(port, GFP_KERNEL);
if (result)
return result;
}

/* Configure the termios structure */
cp210x_get_termios(tty, port);
Expand Down

0 comments on commit 597df47

Please sign in to comment.