Merge branch 'pm-core'

[karo-tx-linux.git] / drivers / usb / core / port.c

diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c
index 5487fe308f01b7be30bcecebc12726a295f9daa9..514b563e3e5fbc964107a31bbd18a7735d96e565 100644 (file)
--- a/drivers/usb/core/port.c
+++ b/drivers/usb/core/port.c
@@ -168,12 +168,18 @@ static int usb_port_runtime_suspend(struct device *dev)
 
        return retval;
 }
+
+static int usb_port_prepare(struct device *dev)
+{
+       return 1;
+}
 #endif
 
 static const struct dev_pm_ops usb_port_pm_ops = {
 #ifdef CONFIG_PM
        .runtime_suspend =      usb_port_runtime_suspend,
        .runtime_resume =       usb_port_runtime_resume,
+       .prepare =              usb_port_prepare,
 #endif
 };