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

usb: usb_generic_probe() obeys authorization 



If called and the device is not authorized to be used, then we won't
choose a configuration (as they are not a concept that exists for an
unauthorized device). However, the device is added to the system.

Signed-off-by: default avatarInaky Perez-Gonzalez <inaky@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 72230abb

drivers/usb/core/generic.c

+11 −8
Original line number Diff line number Diff line
@@ -161,6 +161,9 @@ static int generic_probe(struct usb_device *udev) 
	/* Choose and set the configuration.  This registers the interfaces

	 * with the driver core and lets interface drivers bind to them.

	 */

	if (udev->authorized == 0)

		dev_err(&udev->dev, "Device is not authorized for usage\n");

	else {

		c = choose_configuration(udev);

		if (c >= 0) {

			err = usb_set_configuration(udev, c);
@@ -171,7 +174,7 @@ static int generic_probe(struct usb_device *udev) 
				 * set other configurations. */

			}

		}



	}

	/* USB device state == configured ... usable */

	usb_notify_add_device(udev);