summaryrefslogtreecommitdiffstats
path: root/drivers/usb/core
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-08 08:36:40 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-08 08:36:40 -0700
commit31e918908ccaf2b651ed8f666120f2a03a97193f (patch)
tree39aab36ced1932d06cb2e3cee037faae0b94a63b /drivers/usb/core
parentae3759c2573031f1306496c6f9f32f20e86f03aa (diff)
parent31880c37c11e28cb81c70757e38392b42e695dc6 (diff)
Merge 3.9-rc6 into usb-next
We want the fixes here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core')
-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 06c4894bf18..b8bad294eeb 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);
}