From 2bbe03ddfa86b06131faba96e65e89ac76eb5ebf Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Mon, 27 Jun 2005 08:18:27 +0200 Subject: [PATCH] --- yaml --- r: 5311 b: refs/heads/master c: b4d3f9d452ec574e0ffb292267427f69bb470631 h: refs/heads/master i: 5309: b8cf404f787f3aaecf90c205c73cf9721218e04a 5307: d25b62974373519a86a3165ad1a9a092f1c58404 5303: 669e424ce1a0d9deab9a60206bda28684299bff7 5295: 263a867ceb04f0b9cd3bc1e5218461f516d30ddf 5279: a94bfb6650de039e946762c3ebf39834c6f72ff4 5247: d2e409c1152f0dd2a4fc6d7fbb22c987547c643e v: v3 --- [refs] | 2 +- trunk/sound/usb/usbaudio.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0fddaa5dc088..6ab5fcb60ba0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 573567e07bb4470ff177f17d1adca3f3bd310221 +refs/heads/master: b4d3f9d452ec574e0ffb292267427f69bb470631 diff --git a/trunk/sound/usb/usbaudio.c b/trunk/sound/usb/usbaudio.c index facd9fc11c3c..c57b44511b54 100644 --- a/trunk/sound/usb/usbaudio.c +++ b/trunk/sound/usb/usbaudio.c @@ -2408,10 +2408,9 @@ static int parse_audio_format(snd_usb_audio_t *chip, struct audioformat *fp, if (chip->usb_id == USB_ID(0x041e, 0x3000) || chip->usb_id == USB_ID(0x041e, 0x3020)) { if (fmt[3] == USB_FORMAT_TYPE_I && - stream == SNDRV_PCM_STREAM_PLAYBACK && fp->rates != SNDRV_PCM_RATE_48000 && fp->rates != SNDRV_PCM_RATE_96000) - return -1; /* use 48k only */ + return -1; } #endif return 0;