[alsa-cvslog] CVS: alsa-driver/usb usbmixer.patch,1.2,1.3
Brought to you by:
perex
From: Clemens L. <cla...@us...> - 2005-04-29 15:26:22
|
Update of /cvsroot/alsa/alsa-driver/usb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6093/alsa-driver/usb Modified Files: usbmixer.patch Log Message: Summary: usb-audio - add mixer control notifications Add support for the optional status interrupt endpoint in audio control interfaces, and translate USB status notifications into ALSA mixer control notifications. Index: usbmixer.patch =================================================================== RCS file: /cvsroot/alsa/alsa-driver/usb/usbmixer.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- usbmixer.patch 29 Apr 2005 15:23:12 -0000 1.2 +++ usbmixer.patch 29 Apr 2005 15:26:14 -0000 1.3 @@ -1,5 +1,5 @@ ---- ../alsa-kernel/usb/usbmixer.c 2005-04-29 11:58:03.000000000 +0200 -+++ usbmixer.c 2005-04-29 12:00:50.000000000 +0200 +--- ../alsa-kernel/usb/usbmixer.c 2005-04-29 12:29:07.000000000 +0200 ++++ usbmixer.c 2005-04-29 12:31:56.000000000 +0200 @@ -1,3 +1,11 @@ +#include <linux/config.h> +#include <linux/version.h> @@ -26,3 +26,15 @@ /* check the mapping table */ for (map = usbmix_ctl_maps; map->vendor; map++) { +@@ -1647,7 +1660,11 @@ + return 0; + + epnum = ep->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11) + buffer_length = le16_to_cpu(ep->wMaxPacketSize); ++#else ++ buffer_length = ep->wMaxPacketSize; ++#endif + transfer_buffer = kmalloc(buffer_length, GFP_KERNEL); + if (!transfer_buffer) + return -ENOMEM; |