1 |
From 16f1f838442dc6430d32d51ddda347b8421ec34b Mon Sep 17 00:00:00 2001 |
2 |
From: Takashi Iwai <tiwai@suse.de> |
3 |
Date: Wed, 4 Jan 2023 16:09:44 +0100 |
4 |
Subject: Revert "ALSA: usb-audio: Drop superfluous interface setup at parsing" |
5 |
|
6 |
From: Takashi Iwai <tiwai@suse.de> |
7 |
|
8 |
commit 16f1f838442dc6430d32d51ddda347b8421ec34b upstream. |
9 |
|
10 |
This reverts commit ac5e2fb425e1121ceef2b9d1b3ffccc195d55707. |
11 |
|
12 |
The commit caused a regression on Behringer UMC404HD (and likely |
13 |
others). As the change was meant only as a minor optimization, it's |
14 |
better to revert it to address the regression. |
15 |
|
16 |
Reported-and-tested-by: Michael Ralston <michael@ralston.id.au> |
17 |
Cc: <stable@vger.kernel.org> |
18 |
Link: https://lore.kernel.org/r/CAC2975JXkS1A5Tj9b02G_sy25ZWN-ys+tc9wmkoS=qPgKCogSg@mail.gmail.com |
19 |
Link: https://lore.kernel.org/r/20230104150944.24918-1-tiwai@suse.de |
20 |
Signed-off-by: Takashi Iwai <tiwai@suse.de> |
21 |
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
22 |
--- |
23 |
sound/usb/stream.c | 6 ++++++ |
24 |
1 file changed, 6 insertions(+) |
25 |
|
26 |
--- a/sound/usb/stream.c |
27 |
+++ b/sound/usb/stream.c |
28 |
@@ -1222,6 +1222,12 @@ static int __snd_usb_parse_audio_interfa |
29 |
if (err < 0) |
30 |
return err; |
31 |
} |
32 |
+ |
33 |
+ /* try to set the interface... */ |
34 |
+ usb_set_interface(chip->dev, iface_no, 0); |
35 |
+ snd_usb_init_pitch(chip, fp); |
36 |
+ snd_usb_init_sample_rate(chip, fp, fp->rate_max); |
37 |
+ usb_set_interface(chip->dev, iface_no, altno); |
38 |
} |
39 |
return 0; |
40 |
} |