diff options
Diffstat (limited to 'sound/usb')
-rw-r--r-- | sound/usb/usbaudio.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index ff2e09a46133..26fb5769d951 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c | |||
@@ -1427,8 +1427,8 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt) | |||
1427 | subs->cur_audiofmt = fmt; | 1427 | subs->cur_audiofmt = fmt; |
1428 | 1428 | ||
1429 | #if 0 | 1429 | #if 0 |
1430 | printk("setting done: format = %d, rate = %d, channels = %d\n", | 1430 | printk("setting done: format = %d, rate = %d..%d, channels = %d\n", |
1431 | fmt->format, fmt->rate, fmt->channels); | 1431 | fmt->format, fmt->rate_min, fmt->rate_max, fmt->channels); |
1432 | printk(" datapipe = 0x%0x, syncpipe = 0x%0x\n", | 1432 | printk(" datapipe = 0x%0x, syncpipe = 0x%0x\n", |
1433 | subs->datapipe, subs->syncpipe); | 1433 | subs->datapipe, subs->syncpipe); |
1434 | #endif | 1434 | #endif |
@@ -2468,11 +2468,12 @@ static int parse_audio_format_i_type(struct snd_usb_audio *chip, struct audiofor | |||
2468 | } | 2468 | } |
2469 | break; | 2469 | break; |
2470 | case USB_AUDIO_FORMAT_PCM8: | 2470 | case USB_AUDIO_FORMAT_PCM8: |
2471 | /* Dallas DS4201 workaround */ | 2471 | pcm_format = SNDRV_PCM_FORMAT_U8; |
2472 | |||
2473 | /* Dallas DS4201 workaround: it advertises U8 format, but really | ||
2474 | supports S8. */ | ||
2472 | if (chip->usb_id == USB_ID(0x04fa, 0x4201)) | 2475 | if (chip->usb_id == USB_ID(0x04fa, 0x4201)) |
2473 | pcm_format = SNDRV_PCM_FORMAT_S8; | 2476 | pcm_format = SNDRV_PCM_FORMAT_S8; |
2474 | else | ||
2475 | pcm_format = SNDRV_PCM_FORMAT_U8; | ||
2476 | break; | 2477 | break; |
2477 | case USB_AUDIO_FORMAT_IEEE_FLOAT: | 2478 | case USB_AUDIO_FORMAT_IEEE_FLOAT: |
2478 | pcm_format = SNDRV_PCM_FORMAT_FLOAT_LE; | 2479 | pcm_format = SNDRV_PCM_FORMAT_FLOAT_LE; |