usb: usb-gigaset free kill urb cleanup

- usb_free_urb() cleanup
- usb_kill_urb() cleanup

Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 5 insertions, 10 deletions

diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
index 4ffa9eb1c28e..5ebf49ac9b23 100644
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -815,14 +815,11 @@ static int gigaset_probe(struct usb_interface *interface,
         return 0;
 
 error:
-        if (ucs->read_urb)
-                usb_kill_urb(ucs->read_urb);
+        usb_kill_urb(ucs->read_urb);
         kfree(ucs->bulk_out_buffer);
-        if (ucs->bulk_out_urb != NULL)
-                usb_free_urb(ucs->bulk_out_urb);
+        usb_free_urb(ucs->bulk_out_urb);
         kfree(cs->inbuf[0].rcvbuf);
-        if (ucs->read_urb != NULL)
-                usb_free_urb(ucs->read_urb);
+        usb_free_urb(ucs->read_urb);
         usb_set_intfdata(interface, NULL);
         ucs->read_urb = ucs->bulk_out_urb = NULL;
         cs->inbuf[0].rcvbuf = ucs->bulk_out_buffer = NULL;
@@ -850,11 +847,9 @@ static void gigaset_disconnect(struct usb_interface *interface)
         usb_kill_urb(ucs->bulk_out_urb);        /* FIXME: only if active? */
 
         kfree(ucs->bulk_out_buffer);
-        if (ucs->bulk_out_urb != NULL)
-                usb_free_urb(ucs->bulk_out_urb);
+        usb_free_urb(ucs->bulk_out_urb);
         kfree(cs->inbuf[0].rcvbuf);
-        if (ucs->read_urb != NULL)
-                usb_free_urb(ucs->read_urb);
+        usb_free_urb(ucs->read_urb);
         ucs->read_urb = ucs->bulk_out_urb = NULL;
         cs->inbuf[0].rcvbuf = ucs->bulk_out_buffer = NULL;