From: Clemens Ladisch <clemens@ladisch.de>
Date: Mon, 27 Jun 2005 06:18:27 +0000 (+0200)
Subject: [ALSA] usb-audio - fix capture of non-48k sample rates on Audigy 2 NX
X-Git-Tag: v2.6.13-rc4~3^2~52
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b4d3f9d452ec574e0ffb292267427f69bb470631;p=linux-2.6-omap-h63xx.git

[ALSA] usb-audio - fix capture of non-48k sample rates on Audigy 2 NX

USB generic driver
On the SB Audigy 2 NX, capturing with sample rates that are not a
multiple of 48 kHz does not seem to work, so disable it.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
---

diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index facd9fc11c3..c57b44511b5 100644
--- a/sound/usb/usbaudio.c
+++ b/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;