rk: revert 20f3d0b+v3.0.66 to v3.0

[firefly-linux-kernel-4.4.55.git] / drivers / pci / pci-driver.c

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 5d5bdf7ecf5f5f1ca4f1650a82518ce97736211c..46767c53917a5e28ee8fcec10d92de6c39609eba 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -726,18 +726,6 @@ static int pci_pm_suspend_noirq(struct device *dev)
 
        pci_pm_set_unknown_state(pci_dev);
 
-       /*
-        * Some BIOSes from ASUS have a bug: If a USB EHCI host controller's
-        * PCI COMMAND register isn't 0, the BIOS assumes that the controller
-        * hasn't been quiesced and tries to turn it off.  If the controller
-        * is already in D3, this can hang or cause memory corruption.
-        *
-        * Since the value of the COMMAND register doesn't matter once the
-        * device has been suspended, we can safely set it to 0 here.
-        */
-       if (pci_dev->class == PCI_CLASS_SERIAL_USB_EHCI)
-               pci_write_config_word(pci_dev, PCI_COMMAND, 0);
-
        return 0;
 }
 
@@ -936,13 +924,6 @@ static int pci_pm_poweroff_noirq(struct device *dev)
        if (!pci_dev->state_saved && !pci_is_bridge(pci_dev))
                pci_prepare_to_sleep(pci_dev);
 
-       /*
-        * The reason for doing this here is the same as for the analogous code
-        * in pci_pm_suspend_noirq().
-        */
-       if (pci_dev->class == PCI_CLASS_SERIAL_USB_EHCI)
-               pci_write_config_word(pci_dev, PCI_COMMAND, 0);
-
        return 0;
 }