---

yaml --- r: 338689 b: refs/heads/master c: 0b8718a h: refs/heads/master i: 338687: 4410a75 v: v3
git-mirror · Nov 21, 2012 · 7c4fe5b · 7c4fe5b
1 parent 49a5838
commit 7c4fe5b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f38c46021aaa0871a96bd922ccbcc9d61c4ae49e
+refs/heads/master: 0b8718a264f58b096753e29f7e04f188bf64938e
diff --git a/trunk/drivers/usb/serial/opticon.c b/trunk/drivers/usb/serial/opticon.c
@@ -184,13 +184,6 @@ static int opticon_open(struct tty_struct *tty, struct usb_serial_port *port)
 	/* Clear RTS line */
 	send_control_msg(port, CONTROL_RTS, 0);
 
-	/* Setup the read URB and start reading from the device */
-	usb_fill_bulk_urb(priv->bulk_read_urb, priv->udev,
-			  usb_rcvbulkpipe(priv->udev,
-					  priv->bulk_address),
-			  priv->bulk_in_buffer, priv->buffer_size,
-			  opticon_read_bulk_callback, priv);
-
 	/* clear the halt status of the enpoint */
 	usb_clear_halt(priv->udev, priv->bulk_read_urb->pipe);
 
@@ -530,6 +523,12 @@ static int opticon_startup(struct usb_serial *serial)
 		goto error;
 	}
 
+	usb_fill_bulk_urb(priv->bulk_read_urb, serial->dev,
+				usb_rcvbulkpipe(serial->dev,
+						priv->bulk_address),
+				priv->bulk_in_buffer, priv->buffer_size,
+				opticon_read_bulk_callback, priv);
+
 	usb_set_serial_data(serial, priv);
 	return 0;