---

yaml
---
r: 27271
b: refs/heads/master
c: d62274b
h: refs/heads/master
i:
  27269: aebbc59
  27267: 37ba381
  27263: 336ee73
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37a6c6117db3f10e1923c14dffa089b10600c4b8
+refs/heads/master: d62274b374ce41dd3a90820b124d28fec292a5b7

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",