Commit 5651440e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "usb: interface authorization: Introduces the USB interface authorization" 



This reverts commit ef0909c5 as the
signed-off-by address is invalid.

Cc: Stefan Koch <stefan.koch10@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4d924d7a

drivers/usb/core/message.c

+0 −38
Original line number Diff line number Diff line
@@ -1555,44 +1555,6 @@ static void usb_release_interface(struct device *dev) 
	kfree(intf);

}



/*

 * usb_deauthorize_interface - deauthorize an USB interface

 *

 * @intf: USB interface structure

 */

void usb_deauthorize_interface(struct usb_interface *intf)

{

	struct device *dev = &intf->dev;



	device_lock(dev->parent);



	if (intf->authorized) {

		device_lock(dev);

		intf->authorized = 0;

		device_unlock(dev);



		usb_forced_unbind_intf(intf);

	}



	device_unlock(dev->parent);

}



/*

 * usb_authorize_interface - authorize an USB interface

 *

 * @intf: USB interface structure

 */

void usb_authorize_interface(struct usb_interface *intf)

{

	struct device *dev = &intf->dev;



	if (!intf->authorized) {

		device_lock(dev);

		intf->authorized = 1; /* authorize interface */

		device_unlock(dev);

	}

}



static int usb_if_uevent(struct device *dev, struct kobj_uevent_env *env)

{

	struct usb_device *usb_dev;

drivers/usb/core/usb.h

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ extern void usb_release_interface_cache(struct kref *ref); 
extern void usb_disable_device(struct usb_device *dev, int skip_ep0);

extern int usb_deauthorize_device(struct usb_device *);

extern int usb_authorize_device(struct usb_device *);

extern void usb_deauthorize_interface(struct usb_interface *);

extern void usb_authorize_interface(struct usb_interface *);

extern void usb_detect_quirks(struct usb_device *udev);

extern void usb_detect_interface_quirks(struct usb_device *udev);

extern int usb_remove_device(struct usb_device *udev);