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

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 <[email protected]>.

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 <[email protected]>
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.

index f75601ca2d52..f10f4e6d3fb8 100644
@@ -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;
 }

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.

index f75601ca2d52..f10f4e6d3fb8 100644
@@ -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;
}