lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ALSA] usb audio: make quirk handling more readable, and fix commented-out code

Browse Source 
usb audio contains useful  debugging code, protected by #if
0. Unfortunately, it will not compile because variable names changed;
fix it.

Dallas workaround is formatted in a way where it is not quite obvious
what is normal code and what is quirk. Reformat it to make it obvious.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Pavel Machek
2008-04-14 13:14:22 +02:00
committed by Takashi Iwai
parent b9d43bcd06
commit 2a56f51bcc
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sound/usb/usbaudio.c
View File

@@ -1427,8 +1427,8 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt)
subs->cur_audiofmt = fmt; subs->cur_audiofmt = fmt;
#if 0 #if 0
printk("setting done: format = %d, rate = %d, channels = %d\n", printk("setting done: format = %d, rate = %d..%d, channels = %d\n",
fmt->format, fmt->rate, fmt->channels); fmt->format, fmt->rate_min, fmt->rate_max, fmt->channels);
printk(" datapipe = 0x%0x, syncpipe = 0x%0x\n", printk(" datapipe = 0x%0x, syncpipe = 0x%0x\n",
subs->datapipe, subs->syncpipe); subs->datapipe, subs->syncpipe);
#endif #endif
@@ -2468,11 +2468,12 @@ static int parse_audio_format_i_type(struct snd_usb_audio *chip, struct audiofor
} }
break; break;
case USB_AUDIO_FORMAT_PCM8: case USB_AUDIO_FORMAT_PCM8:
/* Dallas DS4201 workaround */ pcm_format = SNDRV_PCM_FORMAT_U8;
/* Dallas DS4201 workaround: it advertises U8 format, but really
supports S8. */
if (chip->usb_id == USB_ID(0x04fa, 0x4201)) if (chip->usb_id == USB_ID(0x04fa, 0x4201))
pcm_format = SNDRV_PCM_FORMAT_S8; pcm_format = SNDRV_PCM_FORMAT_S8;
else
pcm_format = SNDRV_PCM_FORMAT_U8;
break; break;
case USB_AUDIO_FORMAT_IEEE_FLOAT: case USB_AUDIO_FORMAT_IEEE_FLOAT:
pcm_format = SNDRV_PCM_FORMAT_FLOAT_LE; pcm_format = SNDRV_PCM_FORMAT_FLOAT_LE;