X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Fwireless%2Fprism54%2Fislpci_hotplug.c;h=11b315ba15e5637459b893d456a5ce23ab66e1f2;hb=a9fdee76789476a10f923f9fb3c84993042da3ac;hp=75ebf8a6f3dc0ec71b34eca5a719a9231e9e3c86;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git diff --git a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/prism54/islpci_hotplug.c index 75ebf8a6f..11b315ba1 100644 --- a/drivers/net/wireless/prism54/islpci_hotplug.c +++ b/drivers/net/wireless/prism54/islpci_hotplug.c @@ -107,6 +107,9 @@ prism54_probe(struct pci_dev *pdev, const struct pci_device_id *id) islpci_private *priv; int rvalue; + /* TRACE(DRV_NAME); */ + + /* Enable the pci device */ if (pci_enable_device(pdev)) { printk(KERN_ERR "%s: pci_enable_device() failed.\n", DRV_NAME); @@ -270,7 +273,7 @@ prism54_suspend(struct pci_dev *pdev, u32 state) printk(KERN_NOTICE "%s: got suspend request (state %d)\n", ndev->name, state); - pci_save_state(pdev); + pci_save_state(pdev, priv->pci_state); /* tell the device not to trigger interrupts for now... */ isl38xx_disable_interrupts(priv->device_base); @@ -294,7 +297,7 @@ prism54_resume(struct pci_dev *pdev) printk(KERN_NOTICE "%s: got resume request\n", ndev->name); - pci_restore_state(pdev); + pci_restore_state(pdev, priv->pci_state); /* alright let's go into the PREBOOT state */ islpci_reset(priv, 1);