---

yaml --- r: 185319 b: refs/heads/master c: 0c4db6d h: refs/heads/master i: 185317: 5f771cc 185315: 100dd87 185311: 1ae8789 v: v3
git-mirror · Mar 2, 2010 · 86e7b0d · 86e7b0d
1 parent fa5db50
commit 86e7b0d
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: 0534d46848990e8eed7cd0832d745d813e827261
+refs/heads/master: 0c4db6df915bc470f0cd32fe48287fa6eb6adfb4
diff --git a/trunk/drivers/usb/core/sysfs.c b/trunk/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;
 }