USB: gadget: composite: Move switch_set_state calls to a work queue
Mike Lockwood [Mon, 28 Jun 2010 00:05:55 +0000 (20:05 -0400)]
Signed-off-by: Mike Lockwood <lockwood@android.com>

drivers/usb/gadget/composite.c
include/linux/usb/composite.h

index f917efb..cb35adc 100644 (file)
@@ -781,7 +781,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);
 
        if (result >= 0 && cdev->delayed_status)
                result = USB_GADGET_DELAYED_STATUS;
@@ -1430,7 +1430,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);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -1511,6 +1511,19 @@ static u8 override_id(struct usb_composite_dev *cdev, u8 *desc)
        return *desc;
 }
 
+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;
@@ -1564,6 +1577,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;
 
index f9ca73f..9405ea2 100644 (file)
@@ -376,6 +376,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);