From 86e7b0d63839a9fab3d614c8860f5d1482d05f6a Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Fri, 8 Jan 2010 12:56:42 -0500 Subject: [PATCH] --- yaml --- r: 185319 b: refs/heads/master c: 0c4db6df915bc470f0cd32fe48287fa6eb6adfb4 h: refs/heads/master i: 185317: 5f771cc5b39bbc43beb0024cc080687d762c915a 185315: 100dd87afd86e0d969670fa1b13b4040046b981a 185311: 1ae8789db3ab09e850104203b571e4a74b96e75c v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/sysfs.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index beea4234f174..601c78222924 100644 --- 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 index d8f3bfe1559f..5a1a0e2b6474 100644 --- 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; }