1 files changed, 23 insertions, 15 deletions

diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index 9840bade79f9..bfc6998cd16f 100644
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -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;