summaryrefslogtreecommitdiff
path: root/sound/usb
diff options
context:
space:
mode:
authorMariusz Kozlowski <m.kozlowski@tuxland.pl>2006-11-08 15:37:04 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2006-12-01 14:23:35 -0800
commit68df9de1d0e95034355283dc12056f93de8e0a79 (patch)
tree76561c61ef3056d48e79d7b8d9a613c2f2144a72 /sound/usb
parentf5e135af8737bdc57168cddb3fd83028b25c26cd (diff)
downloadlinux-3.10-68df9de1d0e95034355283dc12056f93de8e0a79.tar.gz
linux-3.10-68df9de1d0e95034355283dc12056f93de8e0a79.tar.bz2
linux-3.10-68df9de1d0e95034355283dc12056f93de8e0a79.zip
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/usb')
-rw-r--r--sound/usb/usbmixer.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
index 1024c178f5c..e74eb1bc8d8 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)
kfree(mixer->urb->transfer_buffer);
usb_free_urb(mixer->urb);
}
- if (mixer->rc_urb)
- usb_free_urb(mixer->rc_urb);
+ usb_free_urb(mixer->rc_urb);
kfree(mixer->rc_setup_packet);
kfree(mixer);
}
@@ -2056,8 +2055,6 @@ void snd_usb_mixer_disconnect(struct list_head *p)
struct usb_mixer_interface *mixer;
mixer = list_entry(p, struct usb_mixer_interface, list);
- if (mixer->urb)
- usb_kill_urb(mixer->urb);
- if (mixer->rc_urb)
- usb_kill_urb(mixer->rc_urb);
+ usb_kill_urb(mixer->urb);
+ usb_kill_urb(mixer->rc_urb);
}