aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/core
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-04-19 07:03:08 -0400
committerIngo Molnar <mingo@kernel.org>2013-04-19 07:03:08 -0400
commit5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e (patch)
tree524d8ac34cc8c7ef68b43e3ee6e08e27db86299c /drivers/usb/core
parentb6d5278dc8385eaf2e3904a4af444a04f6ae4e71 (diff)
parent94c1acf2c85b03a59a42d931a94a13a76c123a62 (diff)
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/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 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)
67{ 67{
68 struct usb_port *port_dev = to_usb_port(dev); 68 struct usb_port *port_dev = to_usb_port(dev);
69 69
70 dev_pm_qos_hide_flags(dev);
71 kfree(port_dev); 70 kfree(port_dev);
72} 71}
73 72