From 16f8f98272541ac4b30c4811b73db37d94767eae Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Fri, 7 Apr 2006 04:10:51 -0400 Subject: [PATCH] --- yaml --- r: 27271 b: refs/heads/master c: d62274b374ce41dd3a90820b124d28fec292a5b7 h: refs/heads/master i: 27269: aebbc59384113d7a2645a2a354982a7c2b78950b 27267: 37ba38127dfad3710653a68c77892699dfd999b0 27263: 336ee73459127e13271a001e4e0c2e73ad927437 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/orinoco_pci.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e17b246211db..cb5f394f8d4e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37a6c6117db3f10e1923c14dffa089b10600c4b8 +refs/heads/master: d62274b374ce41dd3a90820b124d28fec292a5b7 diff --git a/trunk/drivers/net/wireless/orinoco_pci.c b/trunk/drivers/net/wireless/orinoco_pci.c index 5362c214fc8e..e57e92bc6ab8 100644 --- a/trunk/drivers/net/wireless/orinoco_pci.c +++ b/trunk/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",