[PATCH 33/33] usb: usbmixer free kill urb cleanup

From: Mariusz Kozlowski
Date: Wed Nov 08 2006 - 09:40:23 EST


Hello,

- usb_free_urb() cleanup
- usb_kill_urb() cleanup

Signed-off-by: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx>

--- linux-2.6.19-rc4-orig/sound/usb/usbmixer.c 2006-11-06 17:09:28.000000000 +0100
+++ linux-2.6.19-rc4/sound/usb/usbmixer.c 2006-11-07 17:09:16.000000000 +0100
@@ -1620,8 +1620,7 @@ static void snd_usb_mixer_free(struct us
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 lis
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);
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/