Update of /cvsroot/alsa/alsa-driver/usb In directory sc8-pr-cvs1:/tmp/cvs-serv6469/usb
Modified Files: usbaudio.patch Log Message: - set async_unlink option to 0 for older kernels (usb-uhci seems broken). once after it's fixed, we can change the ifdef condition. Index: usbaudio.patch =================================================================== RCS file: /cvsroot/alsa/alsa-driver/usb/usbaudio.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- usbaudio.patch 1 Jun 2003 18:37:45 -0000 1.1 +++ usbaudio.patch 25 Nov 2003 12:02:33 -0000 1.2 @@ -1,11 +1,25 @@ ---- usbaudio.c 2003-06-01 20:32:24.000000000 +0200 -+++ usbaudio.c.old 2003-06-01 20:32:42.000000000 +0200 +--- usbaudio.c 2003-11-24 18:49:59.000000000 +0100 ++++ usbaudio.c 2003-11-24 18:51:33.000000000 +0100 @@ -1,3 +1,4 @@ +#include "usbaudio.inc" /* * (Tentative) USB Audio Driver for ALSA * -@@ -1656,9 +1657,11 @@ +@@ -68,7 +69,12 @@ + static int vid[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = -1 }; /* Vendor ID for this card */ + static int pid[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = -1 }; /* Product ID for this card */ + static int nrpacks = 4; /* max. number of packets per urb */ +-static int async_unlink = 1; ++static int async_unlink = ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) ++1; ++#else ++0; /* disabled as default for buggy async-unlink handling */ ++#endif + + MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i"); + MODULE_PARM_DESC(index, "Index value for the USB audio adapter."); +@@ -1761,9 +1767,11 @@ * entry point for linux usb interface */ @@ -17,7 +31,7 @@ static struct usb_device_id usb_audio_ids [] = { #include "usbquirks.h" -@@ -1671,10 +1674,15 @@ +@@ -1776,10 +1784,15 @@ MODULE_DEVICE_TABLE (usb, usb_audio_ids); static struct usb_driver usb_audio_driver = { @@ -33,7 +47,7 @@ .id_table = usb_audio_ids, }; -@@ -2744,6 +2752,7 @@ +@@ -2918,6 +2931,7 @@ } } @@ -41,7 +55,7 @@ /* * new 2.5 USB kernel API */ -@@ -2764,6 +2773,8 @@ +@@ -2938,6 +2952,8 @@ snd_usb_audio_disconnect(interface_to_usbdev(intf), dev_get_drvdata(&intf->dev)); } @@ -50,7 +64,7 @@ static int __init snd_usb_audio_init(void) -@@ -2803,3 +2814,5 @@ +@@ -2981,3 +2997,5 @@ __setup("snd-usb-audio=", snd_usb_audio_module_setup); #endif /* !MODULE */ ------------------------------------------------------- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog