mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
USB: ipaq: minor ipaq_open() cleanup.
Commit b512504e5671f83638be0ddr085c4b1832f623d3 made ipaq_open() a bit messy by moving the read urb submission far from its usb_fill_bulk_urb() call and the comment explaining what it does. This patch put they together again. Although only compiled tested, should not break the fix introduced by b512504e5671f83638be0ddr085c4b1832f623d3, of course. Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
25d94e682c
commit
014aa2a3c3
1 changed files with 23 additions and 15 deletions
|
@ -652,11 +652,6 @@ static int ipaq_open(struct usb_serial_port *port, struct file *filp)
|
|||
port->bulk_out_size = port->write_urb->transfer_buffer_length = URBDATA_SIZE;
|
||||
|
||||
msleep(1000*initial_wait);
|
||||
/* 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,
|
||||
ipaq_read_bulk_callback, port);
|
||||
|
||||
/*
|
||||
* Send out control message observed in win98 sniffs. Not sure what
|
||||
|
@ -670,18 +665,31 @@ static int ipaq_open(struct usb_serial_port *port, struct file *filp)
|
|||
result = usb_control_msg(serial->dev,
|
||||
usb_sndctrlpipe(serial->dev, 0), 0x22, 0x21,
|
||||
0x1, 0, NULL, 0, 100);
|
||||
if (result == 0) {
|
||||
result = usb_submit_urb(port->read_urb, GFP_KERNEL);
|
||||
if (result) {
|
||||
err("%s - failed submitting read urb, error %d", __FUNCTION__, result);
|
||||
goto error;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
if (!result)
|
||||
break;
|
||||
|
||||
msleep(1000);
|
||||
}
|
||||
err("%s - failed doing control urb, error %d", __FUNCTION__, result);
|
||||
goto error;
|
||||
|
||||
if (!retries && result) {
|
||||
err("%s - failed doing control urb, error %d", __FUNCTION__,
|
||||
result);
|
||||
goto error;
|
||||
}
|
||||
|
||||
/* 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,
|
||||
ipaq_read_bulk_callback, port);
|
||||
|
||||
result = usb_submit_urb(port->read_urb, GFP_KERNEL);
|
||||
if (result) {
|
||||
err("%s - failed submitting read urb, error %d", __FUNCTION__, result);
|
||||
goto error;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
enomem:
|
||||
result = -ENOMEM;
|
||||
|
|
Loading…
Reference in a new issue