[PATCH] [UBUNTU:sound/usb] Fix non-48 kHz sample rates on SB Audigy 2 ZS

[crimsun at fungus.sh.nu]

Subject: [PATCH] [UBUNTU:sound/usb] Fix non-48 kHz sample rates on SB Audigy 2 ZS

UpstreamStatus: Added in upstream usb/usbaudio.c r1.166

Clemens Ladisch fixed an issue in the usb-audio driver where sample
rates that are not multiples of 48 kHz prevent analog output from
working. All sample rates that are not multiples of 48 kHz are now
disabled. (Digital output is not yet supported.)

Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>

---

 sound/usb/usbaudio.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

b6644fa550b63ea1e60f8cd0a33f4c05aacedb7d
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 78b0316..cb73297 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -2496,12 +2496,13 @@ static int parse_audio_format(snd_usb_au
 	if (err < 0)
 		return err;
 #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
 	 * but not in ordinary way.  so we enable only 48k atm.
 	 */
 	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 &&
 		    fp->rates != SNDRV_PCM_RATE_48000 &&
 		    fp->rates != SNDRV_PCM_RATE_96000)
-- 
1.1.3


-- 
Daniel T. Chen            crimsun at ubuntu.com
GPG key:   www.sh.nu/~crimsun/pubkey.gpg.asc
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20060324/02d04bfc/attachment.sig>