---

yaml --- r: 133532 b: refs/heads/master c: b2bdf3a h: refs/heads/master v: v3
git-mirror · Mar 24, 2009 · 3765e40 · 3765e40
1 parent 11d1610
commit 3765e40
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6da9c99059bf24fb1faae6b9613bae64ea50c05e
+refs/heads/master: b2bdf3a789162aa6ff9c6f139bee9cc7954bc5b4
diff --git a/trunk/drivers/usb/gadget/composite.c b/trunk/drivers/usb/gadget/composite.c
@@ -149,16 +149,17 @@ int __init usb_add_function(struct usb_configuration *config,
 int usb_function_deactivate(struct usb_function *function)
 {
 	struct usb_composite_dev	*cdev = function->config->cdev;
+	unsigned long			flags;
 	int				status = 0;
 
-	spin_lock(&cdev->lock);
+	spin_lock_irqsave(&cdev->lock, flags);
 
 	if (cdev->deactivations == 0)
 		status = usb_gadget_disconnect(cdev->gadget);
 	if (status == 0)
 		cdev->deactivations++;
 
-	spin_unlock(&cdev->lock);
+	spin_unlock_irqrestore(&cdev->lock, flags);
 	return status;
 }