projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ae9957b
)
ALSA: usb-audio: fix rate on Ozone Z90 USB headset
author
Daehwan Jung
<dh10.jung@samsung.com>
Wed, 16 Jun 2021 09:34:55 +0000
(18:34 +0900)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 14 Jul 2021 14:55:35 +0000
(16:55 +0200)
commit
aecc19ec404bdc745c781058ac97a373731c3089
upstream.
It mislabels its 96 kHz altsetting and that's why it causes some noise
Signed-off-by: Daehwan Jung <dh10.jung@samsung.com>
Cc: <stable@vger.kernel.org>
Link:
https://lore.kernel.org/r/1623836097-61918-1-git-send-email-dh10.jung@samsung.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/usb/format.c
patch
|
blob
|
history
diff --git
a/sound/usb/format.c
b/sound/usb/format.c
index 91f0ed4a2e7eb16bcaf21cccc841a21dc7947a84..5c5b76c611480fe0343114f81c0229dbb4da936b 100644
(file)
--- a/
sound/usb/format.c
+++ b/
sound/usb/format.c
@@
-208,9
+208,11
@@
static int parse_audio_format_rates_v1(struct snd_usb_audio *chip, struct audiof
continue;
/* C-Media CM6501 mislabels its 96 kHz altsetting */
/* Terratec Aureon 7.1 USB C-Media 6206, too */
+ /* Ozone Z90 USB C-Media, too */
if (rate == 48000 && nr_rates == 1 &&
(chip->usb_id == USB_ID(0x0d8c, 0x0201) ||
chip->usb_id == USB_ID(0x0d8c, 0x0102) ||
+ chip->usb_id == USB_ID(0x0d8c, 0x0078) ||
chip->usb_id == USB_ID(0x0ccd, 0x00b1)) &&
fp->altsetting == 5 && fp->maxpacksize == 392)
rate = 96000;