diff options
-rw-r--r-- | drivers/isdn/gigaset/usb-gigaset.c | 15 |
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, | |||
815 | return 0; | 815 | return 0; |
816 | 816 | ||
817 | error: | 817 | error: |
818 | if (ucs->read_urb) | 818 | usb_kill_urb(ucs->read_urb); |
819 | usb_kill_urb(ucs->read_urb); | ||
820 | kfree(ucs->bulk_out_buffer); | 819 | kfree(ucs->bulk_out_buffer); |
821 | if (ucs->bulk_out_urb != NULL) | 820 | usb_free_urb(ucs->bulk_out_urb); |
822 | usb_free_urb(ucs->bulk_out_urb); | ||
823 | kfree(cs->inbuf[0].rcvbuf); | 821 | kfree(cs->inbuf[0].rcvbuf); |
824 | if (ucs->read_urb != NULL) | 822 | usb_free_urb(ucs->read_urb); |
825 | usb_free_urb(ucs->read_urb); | ||
826 | usb_set_intfdata(interface, NULL); | 823 | usb_set_intfdata(interface, NULL); |
827 | ucs->read_urb = ucs->bulk_out_urb = NULL; | 824 | ucs->read_urb = ucs->bulk_out_urb = NULL; |
828 | cs->inbuf[0].rcvbuf = ucs->bulk_out_buffer = NULL; | 825 | cs->inbuf[0].rcvbuf = ucs->bulk_out_buffer = NULL; |
@@ -850,11 +847,9 @@ static void gigaset_disconnect(struct usb_interface *interface) | |||
850 | usb_kill_urb(ucs->bulk_out_urb); /* FIXME: only if active? */ | 847 | usb_kill_urb(ucs->bulk_out_urb); /* FIXME: only if active? */ |
851 | 848 | ||
852 | kfree(ucs->bulk_out_buffer); | 849 | kfree(ucs->bulk_out_buffer); |
853 | if (ucs->bulk_out_urb != NULL) | 850 | usb_free_urb(ucs->bulk_out_urb); |
854 | usb_free_urb(ucs->bulk_out_urb); | ||
855 | kfree(cs->inbuf[0].rcvbuf); | 851 | kfree(cs->inbuf[0].rcvbuf); |
856 | if (ucs->read_urb != NULL) | 852 | usb_free_urb(ucs->read_urb); |
857 | usb_free_urb(ucs->read_urb); | ||
858 | ucs->read_urb = ucs->bulk_out_urb = NULL; | 853 | ucs->read_urb = ucs->bulk_out_urb = NULL; |
859 | cs->inbuf[0].rcvbuf = ucs->bulk_out_buffer = NULL; | 854 | cs->inbuf[0].rcvbuf = ucs->bulk_out_buffer = NULL; |
860 | 855 | ||