Re: [Bug 770] New: usbaudio does not compile

[Takashi Iwai <tiwai@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 972 bytes --]

Hi,

At Tue, 03 Jun 2003 09:49:58 -0700,
Martin J. Bligh <mbligh@aracnet.com> wrote:
> 
> http://bugme.osdl.org/show_bug.cgi?id=770
> 
>            Summary: usbaudio does not compile
>     Kernel Version: 2.5.70-bk8
>             Status: NEW
>           Severity: normal
>              Owner: bugme-janitors@lists.osdl.org
>          Submitter: a.akhavan@ndr.de
> 
> 
> Distribution: SuSE 8.2
> Hardware Environment: Acer Travelmate 800 LCi
> Software Environment: gcc 3.3
> Problem Description: usbaudio does not compile on 2.5.70-bk8
> (I've skipped a few snapshots, so it might have been introduced at > 2.5.70-bk5)
> It used to compile before. 
> 
> Error-log:
(snip)

this bug appears only when CONFIG_SND_DEBUG_DETECT is set, so i didn't
notice that.
please apply the patch below, or simply turn off
CONFIG_SND_DEBUG_DETECT (it's anyway redundant).

-- 
Takashi Iwai <tiwai@suse.de>		SuSE Linux AG - www.suse.de
ALSA Developer				ALSA Project - www.alsa-project.org

[-- Attachment #2: usb-fix.dif --]
[-- Type: application/octet-stream, Size: 487 bytes --]

--- linux/sound/usb/usbaudio.c	2 Jun 2003 10:04:45 -0000	1.56
+++ linux/sound/usb/usbaudio.c	3 Jun 2003 10:05:59 -0000
@@ -1939,7 +1939,7 @@
 	switch (format) {
 	case 0: /* some devices don't define this correctly... */
 		snd_printdd(KERN_INFO "%d:%u:%d : format type 0 is detected, processed as PCM\n",
-			    dev->devnum, iface_no, altno);
+			    dev->devnum, fp->iface, fp->altsetting);
 		/* fall-through */
 	case USB_AUDIO_FORMAT_PCM:
 		if (sample_width > sample_bytes * 8) {