From: Alan Stern <stern@rowland.harvard.edu>
Date: Fri, 8 Jan 2010 17:56:42 +0000 (-0500)
Subject: USB: use the device lock for persist_enabled
X-Git-Tag: v2.6.34-rc1~215^2~111
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c4db6df915bc470f0cd32fe48287fa6eb6adfb4;p=platform%2Fkernel%2Flinux-3.10.git

USB: use the device lock for persist_enabled

This patch (as1325) changes the locking for the persist_enabled flag
in struct usb_device.  Now it is protected by the device lock, along
with all its neighboring bit flags, instead of the PM lock (which is
about to vanish anyway).

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
index d8f3bfe..5a1a0e2 100644
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
@@ -256,9 +256,10 @@ set_persist(struct device *dev, struct device_attribute *attr,
 
 	if (sscanf(buf, "%d", &value) != 1)
 		return -EINVAL;
-	usb_pm_lock(udev);
+
+	usb_lock_device(udev);
 	udev->persist_enabled = !!value;
-	usb_pm_unlock(udev);
+	usb_unlock_device(udev);
 	return count;
 }