summaryrefslogtreecommitdiff
path: root/drivers/usb/core/generic.c
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2019-02-08 09:40:29 +0530
committerViresh Kumar <viresh.kumar@linaro.org>2019-02-08 09:40:29 +0530
commitaf816ddfbdf049dfce251513af4b5dc903c9764c (patch)
tree15fe94fb3dbb0db54d203c2a1229a0b7a9c3a608 /drivers/usb/core/generic.c
parent446fae2bb5395f3028d8e3aae1508737e5a72ea1 (diff)
parentdab535052f67db0ff48b1b23e714b58650d1a787 (diff)
Merge branch 'cpufreq/qcom-hw' into cpufreq/arm/linux-next
Diffstat (limited to 'drivers/usb/core/generic.c')
-rw-r--r--drivers/usb/core/generic.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c
index 356b05c82dbc..f713cecc1f41 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