From ee73b8f895dcbce963b137f96bac5f001e469fb1 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Sun, 27 Jun 2010 20:05:55 -0400 Subject: [PATCH] USB: gadget: composite: Move switch_set_state calls to a work queue Signed-off-by: Mike Lockwood --- drivers/usb/gadget/composite.c | 18 ++++++++++++++++-- include/linux/usb/composite.h | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index cfecc8c84968..d8fa237e509a 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -505,7 +505,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; } @@ -949,7 +949,7 @@ static void composite_disconnect(struct usb_gadget *gadget) reset_config(cdev); spin_unlock_irqrestore(&cdev->lock, flags); - switch_set_state(&cdev->sdev, 0); + schedule_work(&cdev->switch_work); } /*-------------------------------------------------------------------------*/ @@ -1027,6 +1027,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 __init composite_bind(struct usb_gadget *gadget) { struct usb_composite_dev *cdev; @@ -1074,6 +1087,7 @@ static int __init 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 203d2c90e1ad..f25a1eb653dc 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h @@ -351,6 +351,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); -- 2.34.1