1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/misc/hpilo.c b/drivers/misc/hpilo.c
index 6df0da4085e3..12ccdf94e4fa 100644
--- a/drivers/misc/hpilo.c
+++ b/drivers/misc/hpilo.c
@@ -736,7 +736,14 @@ static void ilo_remove(struct pci_dev *pdev)
         free_irq(pdev->irq, ilo_hw);
         ilo_unmap_device(pdev, ilo_hw);
         pci_release_regions(pdev);
-        pci_disable_device(pdev);
+        /*
+         * pci_disable_device(pdev) used to be here. But this PCI device has
+         * two functions with interrupt lines connected to a single pin. The
+         * other one is a USB host controller. So when we disable the PIN here
+         * e.g. by rmmod hpilo, the controller stops working. It is because
+         * the interrupt link is disabled in ACPI since it is not refcounted
+         * yet. See acpi_pci_link_free_irq called from acpi_pci_irq_disable.
+         */
         kfree(ilo_hw);
         ilo_hwdev[(minor / max_ccb)] = 0;
 }
@@ -826,7 +833,7 @@ unmap:
 free_regions:
         pci_release_regions(pdev);
 disable:
-        pci_disable_device(pdev);
+/*      pci_disable_device(pdev);  see comment in ilo_remove */
 free:
         kfree(ilo_hw);
 out: