revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / net / usb / usbnet.c

diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 2928586bcb82a952bf08b0ac4da5f4fb2ef3ded5..1fab9672271b04ff18e1f8d1f3e5e6959444f1ba 100644 (file)
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -45,7 +45,6 @@
 #include <linux/usb/usbnet.h>
 #include <linux/slab.h>
 #include <linux/kernel.h>
-#include <linux/pm_runtime.h>
 
 #define DRIVER_VERSION         "22-Aug-2005"
 
@@ -1277,16 +1276,6 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
        struct usb_device               *xdev;
        int                             status;
        const char                      *name;
-       struct usb_driver       *driver = to_usb_driver(udev->dev.driver);
-
-       /* usbnet already took usb runtime pm, so have to enable the feature
-        * for usb interface, otherwise usb_autopm_get_interface may return
-        * failure if USB_SUSPEND(RUNTIME_PM) is enabled.
-        */
-       if (!driver->supports_autosuspend) {
-               driver->supports_autosuspend = 1;
-               pm_runtime_enable(&udev->dev);
-       }
 
        name = udev->dev.driver->name;
        info = (struct driver_info *) prod->driver_info;