Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb4c8fe5 authored by Inaky Perez-Gonzalez's avatar Inaky Perez-Gonzalez Committed by Greg Kroah-Hartman
Browse files

usb: deal with broken config descriptors 



Change usb_get_configuration() so that it is more tolerant to devices
with bad configuration descriptors (it'll make it ignore
configurations that fail to load).

Signed-off-by: default avatarInaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent dfe0d3ba

drivers/usb/core/config.c

+3 −1
Original line number Diff line number Diff line
@@ -475,7 +475,9 @@ int usb_get_configuration(struct usb_device *dev) 
		if (result < 0) {

			dev_err(ddev, "unable to read config index %d "

			    "descriptor/%s\n", cfgno, "start");

			goto err;

			dev_err(ddev, "chopping to %d config(s)\n", cfgno);

			dev->descriptor.bNumConfigurations = cfgno;

			break;

		} else if (result < 4) {

			dev_err(ddev, "config index %d descriptor too short "

			    "(expected %i, got %i)\n", cfgno,