Skip to content

Commit 7af5a14

Browse files
committed
ALSA: usb-audio: Fix regression on Sony WALKMAN NW-A45 DAC
We've got a regression report for USB-audio with Sony WALKMAN NW-A45 DAC device where no sound is audible on recent kernel. The bisection resulted in the code change wrt endpoint management, and the further debug session revealed that it was caused by the order of the USB audio interface. In the earlier code, we always set up the USB interface at first before other setups, but it was changed to be done at the last for UAC2/3, which is more standard way, while keeping the old way for UAC1. OTOH, this device seems requiring the setup of the interface at first just like UAC1. This patch works around the regression by applying the interface setup specifically for the WALKMAN at the beginning of the endpoint setup procedure. This change is written straightforwardly to be easily backported in old kernels. A further cleanup to move the workaround into a generic quirk section will follow in a later patch. Fixes: bf6313a ("ALSA: usb-audio: Refactor endpoint management") Cc: <[email protected]> BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=214105 Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent 13d9c6b commit 7af5a14

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

sound/usb/endpoint.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1287,6 +1287,11 @@ int snd_usb_endpoint_configure(struct snd_usb_audio *chip,
12871287
* to be set up before parameter setups
12881288
*/
12891289
iface_first = ep->cur_audiofmt->protocol == UAC_VERSION_1;
1290+
/* Workaround for Sony WALKMAN NW-A45 DAC;
1291+
* it requires the interface setup at first like UAC1
1292+
*/
1293+
if (chip->usb_id == USB_ID(0x054c, 0x0b8c))
1294+
iface_first = true;
12901295
if (iface_first) {
12911296
err = endpoint_set_interface(chip, ep, true);
12921297
if (err < 0)

0 commit comments

Comments
 (0)