These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / usb / core / message.c

diff --git a/kernel/drivers/usb/core/message.c b/kernel/drivers/usb/core/message.c
index f368d20..8e641b5 100644 (file)
--- a/kernel/drivers/usb/core/message.c
+++ b/kernel/drivers/usb/core/message.c
@@ -1387,8 +1387,6 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
         * new altsetting.
         */
        if (manual) {
-               int i;
-
                for (i = 0; i < alt->desc.bNumEndpoints; i++) {
                        epaddr = alt->endpoint[i].desc.bEndpointAddress;
                        pipe = __create_pipe(dev,
@@ -1555,6 +1553,44 @@ 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;
@@ -1807,6 +1843,7 @@ free_interfaces:
                intfc = cp->intf_cache[i];
                intf->altsetting = intfc->altsetting;
                intf->num_altsetting = intfc->num_altsetting;
+               intf->authorized = !!HCD_INTF_AUTHORIZED(hcd);
                kref_get(&intfc->ref);
 
                alt = usb_altnum_to_altsetting(intf, 0);