FAILED: patch "[PATCH] Revert "ALSA: usb-audio: Drop superfluous interface setup at" failed to apply to 6.1-stable tree

FAILED: patch "[PATCH] Revert "ALSA: usb-audio: Drop superfluous interface setup at" failed to apply to 6.1-stable tree

[gregkh]

The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

Possible dependencies:

16f1f838442d ("Revert "ALSA: usb-audio: Drop superfluous interface setup at parsing"")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 16f1f838442dc6430d32d51ddda347b8421ec34b Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 4 Jan 2023 16:09:44 +0100
Subject: [PATCH] Revert "ALSA: usb-audio: Drop superfluous interface setup at
 parsing"

This reverts commit ac5e2fb425e1121ceef2b9d1b3ffccc195d55707.

The commit caused a regression on Behringer UMC404HD (and likely
others).  As the change was meant only as a minor optimization, it's
better to revert it to address the regression.

Reported-and-tested-by: Michael Ralston <michael@ralston.id.au>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/CAC2975JXkS1A5Tj9b02G_sy25ZWN-ys+tc9wmkoS=qPgKCogSg@mail.gmail.com
Link: https://lore.kernel.org/r/20230104150944.24918-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/usb/stream.c b/sound/usb/stream.c
index f75601ca2d52..f10f4e6d3fb8 100644
--- a/sound/usb/stream.c
+++ b/sound/usb/stream.c
@@ -1222,6 +1222,12 @@ static int __snd_usb_parse_audio_interface(struct snd_usb_audio *chip,
 			if (err < 0)
 				return err;
 		}
+
+		/* try to set the interface... */
+		usb_set_interface(chip->dev, iface_no, 0);
+		snd_usb_init_pitch(chip, fp);
+		snd_usb_init_sample_rate(chip, fp, fp->rate_max);
+		usb_set_interface(chip->dev, iface_no, altno);
 	}
 	return 0;
 }

[PATCH] Revert "ALSA: usb-audio: Drop superfluous interface setup at parsing"

[Michael Ralston]

This reverts commit ac5e2fb425e1121ceef2b9d1b3ffccc195d55707.

The commit caused a regression on Behringer UMC404HD (and likely
others).  As the change was meant only as a minor optimization, it's
better to revert it to address the regression.

It appears that the original revert patch had spaces instead of tabs so it 
would not apply. Hopefully this fixes that. Please forgive my ignorance if I 
have misunderstood.

Reported-and-tested-by: Michael Ralston <michael@ralston.id.au>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/CAC2975JXkS1A5Tj9b02G_sy25ZWN-ys+tc9wmkoS=qPgKCogSg@mail.gmail.com
Link: https://lore.kernel.org/r/20230104150944.24918-1-tiwai@suse.de

diff --git a/sound/usb/stream.c b/sound/usb/stream.c
index f75601ca2d52..f10f4e6d3fb8 100644
--- a/sound/usb/stream.c
+++ b/sound/usb/stream.c
@@ -1222,6 +1222,12 @@ static int __snd_usb_parse_audio_interface(struct 
snd_usb_audio *chip,
 			if (err < 0)
 				return err;
 		}
+
+		/* try to set the interface... */
+		usb_set_interface(chip->dev, iface_no, 0);
+		snd_usb_init_pitch(chip, fp);
+		snd_usb_init_sample_rate(chip, fp, fp->rate_max);
+		usb_set_interface(chip->dev, iface_no, altno);
 	}
 	return 0;
 }

Re: [PATCH] Revert "ALSA: usb-audio: Drop superfluous interface setup at parsing"

[Greg KH]

On Sat, Jan 14, 2023 at 05:38:19PM +1100, Michael Ralston wrote:
> This reverts commit ac5e2fb425e1121ceef2b9d1b3ffccc195d55707.
> 
> The commit caused a regression on Behringer UMC404HD (and likely
> others).  As the change was meant only as a minor optimization, it's
> better to revert it to address the regression.
> 
> It appears that the original revert patch had spaces instead of tabs so it 
> would not apply. Hopefully this fixes that. Please forgive my ignorance if I 
> have misunderstood.
> 
> Reported-and-tested-by: Michael Ralston <michael@ralston.id.au>
> Cc: <stable@vger.kernel.org>
> Link: https://lore.kernel.org/r/CAC2975JXkS1A5Tj9b02G_sy25ZWN-ys+tc9wmkoS=qPgKCogSg@mail.gmail.com
> Link: https://lore.kernel.org/r/20230104150944.24918-1-tiwai@suse.de
> 
> diff --git a/sound/usb/stream.c b/sound/usb/stream.c
> index f75601ca2d52..f10f4e6d3fb8 100644
> --- a/sound/usb/stream.c
> +++ b/sound/usb/stream.c
> @@ -1222,6 +1222,12 @@ static int __snd_usb_parse_audio_interface(struct 
> snd_usb_audio *chip,

Thanks for the backport, but your email client line-wrapped this line.
I fixed it up by hand, but you might want to fix your client for next
time.

greg k-h