Merge "usb: core: Do not choose configuration if actconfig is valid" (506fae20) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/usb/core/generic.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -180,7 +180,8 @@ int usb_choose_configuration(struct usb_device *udev)
		"due to insufficient available bus power\n",
		insufficient_power, plural(insufficient_power));

		if (best) {
		/* choose 'best' config only if some other config is not set already */
		if (best && !udev->actconfig) {
		i = best->desc.bConfigurationValue;
		dev_dbg(&udev->dev,
		"configuration #%d chosen from %d choice%s\n",