USB: gadget: composite: Move switch_set_state calls to a work queue

Signed-off-by: Mike Lockwood <lockwood@android.com>

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index d3250ea7f44471de83def2a8203b10a87bcea348..79f4ff1870a3bb1410286c5acb82712d723a03d1 100644 (file)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -532,7 +532,7 @@ static int set_config(struct usb_composite_dev *cdev,
 done:
        usb_gadget_vbus_draw(gadget, power);
 
-       switch_set_state(&cdev->sdev, number);
+       schedule_work(&cdev->switch_work);
        return result;
 }
 
@@ -1067,7 +1067,7 @@ static void composite_disconnect(struct usb_gadget *gadget)
                composite->disconnect(cdev);
        spin_unlock_irqrestore(&cdev->lock, flags);
 
-       switch_set_state(&cdev->sdev, 0);
+       schedule_work(&cdev->switch_work);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -1158,6 +1158,19 @@ string_override(struct usb_gadget_strings **tab, u8 id, const char *s)
        }
 }
 
+static void
+composite_switch_work(struct work_struct *data)
+{
+       struct usb_composite_dev        *cdev =
+               container_of(data, struct usb_composite_dev, switch_work);
+       struct usb_configuration *config = cdev->config;
+
+       if (config)
+               switch_set_state(&cdev->sdev, config->bConfigurationValue);
+       else
+               switch_set_state(&cdev->sdev, 0);
+}
+
 static int composite_bind(struct usb_gadget *gadget)
 {
        struct usb_composite_dev        *cdev;
@@ -1213,6 +1226,7 @@ static int composite_bind(struct usb_gadget *gadget)
        status = switch_dev_register(&cdev->sdev);
        if (status < 0)
                goto fail;
+       INIT_WORK(&cdev->switch_work, composite_switch_work);
 
        cdev->desc = *composite->dev;
        cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket;

diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index 02aa35d07bf9d9790e0c52c0869e216a4f5338f7..aa8f08b21e24f816edebd9083cc1f7cbd075453a 100644 (file)
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -356,6 +356,7 @@ struct usb_composite_dev {
        spinlock_t                      lock;
 
        struct switch_dev sdev;
+       struct work_struct switch_work;
 };
 
 extern int usb_string_id(struct usb_composite_dev *c);