greybus: es1: separate urb allocation and submission
authorJohan Hovold <johan@hovoldconsulting.com>
Wed, 4 Nov 2015 17:55:15 +0000 (18:55 +0100)
committerGreg Kroah-Hartman <gregkh@google.com>
Thu, 5 Nov 2015 04:35:18 +0000 (20:35 -0800)
Separate in-urb allocation and submission.

This is needed for the driver-model rework.

Compile-tested only.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
drivers/staging/greybus/es1.c

index 23860870d4f184bd17afc8bb2e5310a8210fea69..57247712ce601b5490ff430b4cb3aca445e602a7 100644 (file)
@@ -650,7 +650,7 @@ static int ap_probe(struct usb_interface *interface,
                goto error;
        }
 
-       /* Allocate buffers for our cport in messages and start them up */
+       /* Allocate buffers for our cport in messages */
        for (i = 0; i < NUM_CPORT_IN_URB; ++i) {
                struct urb *urb;
                u8 *buffer;
@@ -668,9 +668,6 @@ static int ap_probe(struct usb_interface *interface,
                                  cport_in_callback, hd);
                es1->cport_in_urb[i] = urb;
                es1->cport_in_buffer[i] = buffer;
-               retval = usb_submit_urb(urb, GFP_KERNEL);
-               if (retval)
-                       goto error;
        }
 
        /* Allocate urbs for our CPort OUT messages */
@@ -689,6 +686,13 @@ static int ap_probe(struct usb_interface *interface,
                                                        (S_IWUSR | S_IRUGO),
                                                        gb_debugfs_get(), es1,
                                                        &apb1_log_enable_fops);
+
+       for (i = 0; i < NUM_CPORT_IN_URB; ++i) {
+               retval = usb_submit_urb(es1->cport_in_urb[i], GFP_KERNEL);
+               if (retval)
+                       goto error;
+       }
+
        return 0;
 error:
        ap_disconnect(interface);