Skip to content

Commit

Permalink
Revert "usb: interface authorization: Introduces the USB interface au…
Browse files Browse the repository at this point in the history
…thorization"

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

Cc: Stefan Koch <stefan.koch10@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed Aug 18, 2015
1 parent 4d924d7 commit 5651440
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 40 deletions.
38 changes: 0 additions & 38 deletions drivers/usb/core/message.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions drivers/usb/core/usb.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 5651440

Please sign in to comment.