[PATCH] orinoco_pci: disable device and free IRQ when suspending

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/orinoco_pci.c b/drivers/net/wireless/orinoco_pci.c
index 5362c214fc8e299da8bd0003f5d2bd76ab9fea6f..e57e92bc6ab8c4b67e8a9010737c24d2d7ced18c 100644 (file)
--- a/drivers/net/wireless/orinoco_pci.c
+++ b/drivers/net/wireless/orinoco_pci.c
@@ -304,7 +304,9 @@ static int orinoco_pci_suspend(struct pci_dev *pdev, pm_message_t state)
        
        orinoco_unlock(priv, &flags);
 
+       free_irq(pdev->irq, dev);
        pci_save_state(pdev);
+       pci_disable_device(pdev);
        pci_set_power_state(pdev, PCI_D3hot);
 
        return 0;
@@ -320,8 +322,17 @@ static int orinoco_pci_resume(struct pci_dev *pdev)
        printk(KERN_DEBUG "%s: Orinoco-PCI waking up\n", dev->name);
 
        pci_set_power_state(pdev, 0);
+       pci_enable_device(pdev);
        pci_restore_state(pdev);
 
+       err = request_irq(pdev->irq, orinoco_interrupt, SA_SHIRQ,
+                         dev->name, dev);
+       if (err) {
+               printk(KERN_ERR "%s: Cannot re-allocate IRQ\n", dev->name);
+               pci_disable_device(pdev);
+               return -EBUSY;
+       }
+
        err = orinoco_reinit_firmware(dev);
        if (err) {
                printk(KERN_ERR "%s: Error %d re-initializing firmware on orinoco_pci_resume()\n",