Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 92195
b: refs/heads/master
c: 2a56f51
h: refs/heads/master
i:
  92193: 0fdf4fd
  92191: d78780c
v: v3
  • Loading branch information
Pavel Machek authored and Takashi Iwai committed Apr 24, 2008
1 parent 9972ffe commit 48dd979
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b9d43bcd061956c8144bcb453d07d13236b6ab28
refs/heads/master: 2a56f51bcc3650ecff806450f7fdab5edf57618f
11 changes: 6 additions & 5 deletions trunk/sound/usb/usbaudio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1427,8 +1427,8 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt)
subs->cur_audiofmt = fmt;

#if 0
printk("setting done: format = %d, rate = %d, channels = %d\n",
fmt->format, fmt->rate, fmt->channels);
printk("setting done: format = %d, rate = %d..%d, channels = %d\n",
fmt->format, fmt->rate_min, fmt->rate_max, fmt->channels);
printk(" datapipe = 0x%0x, syncpipe = 0x%0x\n",
subs->datapipe, subs->syncpipe);
#endif
Expand Down Expand Up @@ -2468,11 +2468,12 @@ static int parse_audio_format_i_type(struct snd_usb_audio *chip, struct audiofor
}
break;
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))
pcm_format = SNDRV_PCM_FORMAT_S8;
else
pcm_format = SNDRV_PCM_FORMAT_U8;
break;
case USB_AUDIO_FORMAT_IEEE_FLOAT:
pcm_format = SNDRV_PCM_FORMAT_FLOAT_LE;
Expand Down

0 comments on commit 48dd979

Please sign in to comment.