Patchwork usbcore: Select only first configuration for non-UAC3 compliant devices

login
register
mail settings
Submitter saranya.gopal@intel.com
Date Jan. 5, 2019, 2:02 p.m.
Message ID <1546696957-28294-1-git-send-email-saranya.gopal@intel.com>
Download mbox | patch
Permalink /patch/693343/
State New
Headers show

Comments

saranya.gopal@intel.com - Jan. 5, 2019, 2:02 p.m.
From: Saranya Gopal <saranya.gopal@intel.com>

In most of the UAC1 and UAC2 audio devices, the first
configuration is most often the best configuration.
However, with recent patch to support UAC3 configuration,
second configuration was unintentionally chosen for
some of the UAC1/2 devices that had more than one
configuration. This was because of the existing check
after the audio config check which selected any config
which had a non-vendor class. This patch fixes this issue.

Fixes: f13912d (Select UAC3 configuration for audio if present)
Reported-by: Con Kolivas <kernel@kolivas.org>
Signed-off-by: Saranya Gopal <saranya.gopal@intel.com>
---
 drivers/usb/core/generic.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
Greg Kroah-Hartman - Jan. 5, 2019, 2:35 p.m.
On Sat, Jan 05, 2019 at 07:32:37PM +0530, saranya.gopal@intel.com wrote:
> From: Saranya Gopal <saranya.gopal@intel.com>
> 
> In most of the UAC1 and UAC2 audio devices, the first
> configuration is most often the best configuration.
> However, with recent patch to support UAC3 configuration,
> second configuration was unintentionally chosen for
> some of the UAC1/2 devices that had more than one
> configuration. This was because of the existing check
> after the audio config check which selected any config
> which had a non-vendor class. This patch fixes this issue.
> 
> Fixes: f13912d (Select UAC3 configuration for audio if present)

That should read:
	Fixes: f13912d3f014 ("usbcore: Select UAC3 configuration for audio if present")

Please use the full commit name and more sha1 numbers :)

thanks,

greg k-h

Patch

diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c
index 356b05c..f713cec 100644
--- a/drivers/usb/core/generic.c
+++ b/drivers/usb/core/generic.c
@@ -143,9 +143,12 @@  int usb_choose_configuration(struct usb_device *udev)
 			continue;
 		}
 
-		if (i > 0 && desc && is_audio(desc) && is_uac3_config(desc)) {
-			best = c;
-			break;
+		if (i > 0 && desc && is_audio(desc)) {
+			if (is_uac3_config(desc)) {
+				best = c;
+				break;
+			}
+			continue;
 		}
 
 		/* From the remaining configs, choose the first one whose