summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-04-19 13:03:08 +0200
committerIngo Molnar <mingo@kernel.org>2013-04-19 13:03:08 +0200
commit5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e (patch)
tree524d8ac34cc8c7ef68b43e3ee6e08e27db86299c /drivers/usb
parentMerge tag 'please-pull-cmci_rediscover' of git://git.kernel.org/pub/scm/linux... (diff)
parentamd64_edac: Add Family 16h support (diff)
downloadlinux-5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e.tar.xz
linux-5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e.zip
Merge tag 'edac_amd_f16h' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras
Pull AMD F16h support for amd64_edac from Borislav Petkov. Signed-off-by: Ingo Molnar <mingo@kernel.org>
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);
}