Explorar o código

[ALSA] usb-audio: fix non-48k sample rates with SB Audigy 2 ZS

Modules: USB generic driver

On the Audigy 2 ZS, disable all sample rate that are not a multiple of
48 kHz because the others work only with the digital output which is
not yet supported.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Clemens Ladisch %!s(int64=19) %!d(string=hai) anos
pai
achega
3315937825
Modificáronse 1 ficheiros con 3 adicións e 2 borrados
  1. 3 2
      sound/usb/usbaudio.c

+ 3 - 2
sound/usb/usbaudio.c

@@ -2493,12 +2493,13 @@ static int parse_audio_format(struct snd_usb_audio *chip, struct audioformat *fp
 	if (err < 0)
 	if (err < 0)
 		return err;
 		return err;
 #if 1
 #if 1
-	/* FIXME: temporary hack for extigy/audigy 2 nx */
+	/* FIXME: temporary hack for extigy/audigy 2 nx/zs */
 	/* extigy apparently supports sample rates other than 48k
 	/* extigy apparently supports sample rates other than 48k
 	 * but not in ordinary way.  so we enable only 48k atm.
 	 * but not in ordinary way.  so we enable only 48k atm.
 	 */
 	 */
 	if (chip->usb_id == USB_ID(0x041e, 0x3000) ||
 	if (chip->usb_id == USB_ID(0x041e, 0x3000) ||
-	    chip->usb_id == USB_ID(0x041e, 0x3020)) {
+	    chip->usb_id == USB_ID(0x041e, 0x3020) ||
+	    chip->usb_id == USB_ID(0x041e, 0x3061)) {
 		if (fmt[3] == USB_FORMAT_TYPE_I &&
 		if (fmt[3] == USB_FORMAT_TYPE_I &&
 		    fp->rates != SNDRV_PCM_RATE_48000 &&
 		    fp->rates != SNDRV_PCM_RATE_48000 &&
 		    fp->rates != SNDRV_PCM_RATE_96000)
 		    fp->rates != SNDRV_PCM_RATE_96000)