[alsa-cvslog] CVS: alsa-driver/usb usbaudio.c,1.15,1.16 wrapper.h,1.2,1.3
Brought to you by:
perex
From: Takashi I. <ti...@us...> - 2002-07-08 10:20:11
|
Update of /cvsroot/alsa/alsa-driver/usb In directory usw-pr-cvs1:/tmp/cvs-serv29352 Modified Files: usbaudio.c wrapper.h Log Message: fixed compile warnings. Index: usbaudio.c =================================================================== RCS file: /cvsroot/alsa/alsa-driver/usb/usbaudio.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- usbaudio.c 5 Jul 2002 13:37:53 -0000 1.15 +++ usbaudio.c 8 Jul 2002 10:20:09 -0000 1.16 @@ -1961,7 +1961,7 @@ * now look for an empty slot and create a new card instance */ for (i = 0; i < SNDRV_CARDS; i++) - if (! usb_chip[i]) { + if (snd_enable[i] && ! usb_chip[i]) { card = snd_card_new(snd_index[i], snd_id[i], THIS_MODULE, 0); if (card == NULL) { snd_printk(KERN_ERR "cannot create a card instance %d\n", i); Index: wrapper.h =================================================================== RCS file: /cvsroot/alsa/alsa-driver/usb/wrapper.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wrapper.h 2 Jul 2002 17:22:29 -0000 1.2 +++ wrapper.h 8 Jul 2002 10:20:09 -0000 1.3 @@ -10,6 +10,8 @@ { return usb_submit_urb(urb); } +#undef usb_alloc_urb +#undef usb_submit_urb #define usb_alloc_urb(n,flags) usb_alloc_urb_wrapper(n,flags) #define usb_submit_urb(p,flags) usb_submit_urb_wrapper(p,flags) #endif /* LINUX_VERSION_CODE < 2.5.0 */ @@ -82,6 +84,7 @@ return 0; } +#undef usb_set_interface #define usb_set_interface(dev,iface,alt) hack_usb_set_interface(dev,iface,alt) #endif /* LINUX_VERSION < 2.5.24 */ |