Sorry for the late reply. I had overlooked this. Am 08.11.2006 15:34 schrieb Mariusz Kozlowski: > Hello, > > - usb_free_urb() cleanup > - usb_kill_urb() cleanup > > Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl> Acked-by: Tilman Schmidt <tilman@imap.cc> > --- linux-2.6.19-rc4-orig/drivers/isdn/gigaset/usb-gigaset.c 2006-11-06 17:07:30.000000000 +0100 > +++ linux-2.6.19-rc4/drivers/isdn/gigaset/usb-gigaset.c 2006-11-07 16:51:17.000000000 +0100 > @@ -815,14 +815,11 @@ static int gigaset_probe(struct usb_inte > 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 us > 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; -- Tilman Schmidt E-Mail: tilman@imap.cc Bonn, Germany Diese Nachricht besteht zu 100% aus wiederverwerteten Bits. Ungeöffnet mindestens haltbar bis: (siehe Rückseite)
Attachment:
signature.asc
Description: OpenPGP digital signature
- References:
- [PATCH 2.6.19-rc4] usb urb unlink/free clenup
- From: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
- Re: [PATCH 2.6.19-rc4] usb urb unlink/free clenup
- From: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
- Re: [PATCH 2.6.19-rc4] usb urb unlink/free clenup
- From: Andrew Morton <akpm@osdl.org>
- [PATCH 4/33] usb: usb-gigaset free kill urb cleanup
- From: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
- [PATCH 2.6.19-rc4] usb urb unlink/free clenup
- Prev by Date: Re: [PATCH 1/11] Add __GFP_MOVABLE flag and update callers
- Next by Date: Re: file caps: permit unsafe signaling when CONFIG_FS_CAPS=n
- Previous by thread: [PATCH 4/33] usb: usb-gigaset free kill urb cleanup
- Next by thread: [PATCH 5/33] usb: cinergyT2 free kill urb cleanup
- Index(es):
![]() |