]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
greybus: es2: No need to check before freeing an urb
authorGreg Kroah-Hartman <gregkh@google.com>
Wed, 17 Aug 2016 14:44:11 +0000 (16:44 +0200)
committerGreg Kroah-Hartman <gregkh@google.com>
Fri, 2 Sep 2016 12:20:56 +0000 (14:20 +0200)
usb_kill_urb() and usb_free_urb() can be called with NULL pointers, so
no need to check before calling them.

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

index 4f10accbd50b6f5bc3eb0cada727cde8a1006923..6cd3a6411ad36c8368af2280a24b8fd9343541b0 100644 (file)
@@ -911,6 +911,7 @@ static int check_urb_status(struct urb *urb)
 static void es2_destroy(struct es2_ap_dev *es2)
 {
        struct usb_device *udev;
+       struct urb *urb;
        int i;
 
        debugfs_remove(es2->apb_log_enable_dentry);
@@ -918,10 +919,7 @@ static void es2_destroy(struct es2_ap_dev *es2)
 
        /* Tear down everything! */
        for (i = 0; i < NUM_CPORT_OUT_URB; ++i) {
-               struct urb *urb = es2->cport_out_urb[i];
-
-               if (!urb)
-                       break;
+               urb = es2->cport_out_urb[i];
                usb_kill_urb(urb);
                usb_free_urb(urb);
                es2->cport_out_urb[i] = NULL;
@@ -929,11 +927,7 @@ static void es2_destroy(struct es2_ap_dev *es2)
        }
 
        for (i = 0; i < NUM_ARPC_IN_URB; ++i) {
-               struct urb *urb = es2->arpc_urb[i];
-
-               if (!urb)
-                       break;
-               usb_free_urb(urb);
+               usb_free_urb(es2->arpc_urb[i]);
                kfree(es2->arpc_buffer[i]);
                es2->arpc_buffer[i] = NULL;
        }