summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-04-04 17:41:10 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-04-04 17:41:10 +0200
commit6cb437acd93a01fdbd6bac9c78ac8159c644e576 (patch)
treedcea21b85b8beb7fc4ac12420cea34f4307507e3 /drivers/usb
parentfc1a7fe8b6442a941a8af0cdcc9ff6b666707d60 (diff)
parentbeb0ff390e208e71668a1389e3db02631a88cff5 (diff)
Merge branch 'pm-fixes' into fixes
* pm-fixes: cpufreq: Correct header guards typo cpufreq: check OF node /cpus presence before dereferencing it PM / devfreq: Fix compiler warnings for CONFIG_PM_DEVFREQ unset PM / QoS: Avoid possible deadlock related to sysfs access USB / PM: Don't try to hide PM QoS flags from usb_port_device_release()
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/core/port.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c
index 797f9d514732..65d4e55552c6 100644
--- a/drivers/usb/core/port.c
+++ b/drivers/usb/core/port.c
@@ -67,7 +67,6 @@ static void usb_port_device_release(struct device *dev)
{
struct usb_port *port_dev = to_usb_port(dev);
- dev_pm_qos_hide_flags(dev);
kfree(port_dev);
}