From 597df478f4153add69961cdeca88afdc201ada2f Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Wed, 17 Mar 2010 23:05:55 +0100 Subject: [PATCH] --- yaml --- r: 195347 b: refs/heads/master c: 2db6c7698bbb37128959d3a207fc46e3f45bef3c h: refs/heads/master i: 195345: 7c8d6e881cc4b05e278ec87601f027a873435cc2 195343: 04ef8b62069eed0e4bc1ba4b9afc668c6c53bf3d v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/cp210x.c | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 8605aacef424..ba0f739e7b42 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 056afc0f01701c4c779ac5b4f2dd9058063f337c +refs/heads/master: 2db6c7698bbb37128959d3a207fc46e3f45bef3c diff --git a/trunk/drivers/usb/serial/cp210x.c b/trunk/drivers/usb/serial/cp210x.c index fa4fb5e0cf12..f95a590e1993 100644 --- a/trunk/drivers/usb/serial/cp210x.c +++ b/trunk/drivers/usb/serial/cp210x.c @@ -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); @@ -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);