diff options
author | Mariusz Kozlowski <m.kozlowski@tuxland.pl> | 2006-11-08 09:37:04 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-12-01 17:23:35 -0500 |
commit | 68df9de1d0e95034355283dc12056f93de8e0a79 (patch) | |
tree | 76561c61ef3056d48e79d7b8d9a613c2f2144a72 /sound | |
parent | f5e135af8737bdc57168cddb3fd83028b25c26cd (diff) |
usb: usbmixer 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>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/usb/usbmixer.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c index 1024c178f5c0..e74eb1bc8d87 100644 --- a/sound/usb/usbmixer.c +++ b/sound/usb/usbmixer.c | |||
@@ -1620,8 +1620,7 @@ static void snd_usb_mixer_free(struct usb_mixer_interface *mixer) | |||
1620 | kfree(mixer->urb->transfer_buffer); | 1620 | kfree(mixer->urb->transfer_buffer); |
1621 | usb_free_urb(mixer->urb); | 1621 | usb_free_urb(mixer->urb); |
1622 | } | 1622 | } |
1623 | if (mixer->rc_urb) | 1623 | usb_free_urb(mixer->rc_urb); |
1624 | usb_free_urb(mixer->rc_urb); | ||
1625 | kfree(mixer->rc_setup_packet); | 1624 | kfree(mixer->rc_setup_packet); |
1626 | kfree(mixer); | 1625 | kfree(mixer); |
1627 | } | 1626 | } |
@@ -2056,8 +2055,6 @@ void snd_usb_mixer_disconnect(struct list_head *p) | |||
2056 | struct usb_mixer_interface *mixer; | 2055 | struct usb_mixer_interface *mixer; |
2057 | 2056 | ||
2058 | mixer = list_entry(p, struct usb_mixer_interface, list); | 2057 | mixer = list_entry(p, struct usb_mixer_interface, list); |
2059 | if (mixer->urb) | 2058 | usb_kill_urb(mixer->urb); |
2060 | usb_kill_urb(mixer->urb); | 2059 | usb_kill_urb(mixer->rc_urb); |
2061 | if (mixer->rc_urb) | ||
2062 | usb_kill_urb(mixer->rc_urb); | ||
2063 | } | 2060 | } |