From 27f1e8c88ea5efa2dbd4b79a6575f358a085bed1 Mon Sep 17 00:00:00 2001 From: Mariusz Kozlowski Date: Wed, 8 Nov 2006 15:37:04 +0100 Subject: [PATCH] --- yaml --- r: 41306 b: refs/heads/master c: 68df9de1d0e95034355283dc12056f93de8e0a79 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/usb/usbmixer.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 8bd8a4dbca83..e0bdd140d56e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5e135af8737bdc57168cddb3fd83028b25c26cd +refs/heads/master: 68df9de1d0e95034355283dc12056f93de8e0a79 diff --git a/trunk/sound/usb/usbmixer.c b/trunk/sound/usb/usbmixer.c index 1024c178f5c0..e74eb1bc8d87 100644 --- a/trunk/sound/usb/usbmixer.c +++ b/trunk/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); }