[patch] again, now fix functionality as well

ipw2100-0.56-2.6.9-rc4-friendly.diff (text/plain), 1.29 KB, created by Miika Keskinen on 2004-10-19 05:06:47 UTC

--- ipw2100-0.56-orig/ipw2100.c	2004-10-13 22:06:57.000000000 +0300
+++ ipw2100-0.56-2.6.9-rc4-friendly/ipw2100.c	2004-10-19 14:59:11.710653808 +0300
@@ -550,7 +550,6 @@
 
 	u32 val1 = 0x76543210;
 	u32 val2 = 0xFEDCBA98;
-
 	/* Domain 0 check - all values should be DOA_DEBUG */
 	for (address = IPW_REG_DOA_DEBUG_AREA_START;
 	     address < IPW_REG_DOA_DEBUG_AREA_END;
@@ -6475,7 +6474,15 @@
 		pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
 
 	pci_set_power_state(pdev, 0);
-	pci_restore_state(pdev, NULL);
+	
+	{ 
+	 	int i;
+	        for (i = 0; i < 6; i ++)
+	        	pci_write_config_dword(pdev,
+	               		PCI_BASE_ADDRESS_0 + (i * 4),
+	               		pdev->resource[i].start);
+	        pci_write_config_byte(pdev, PCI_INTERRUPT_LINE, pdev->irq);
+	}
 
 	if (!ipw2100_hw_is_adapter_in_system(dev)) {
 		err = -ENODEV;
@@ -6666,7 +6673,7 @@
 	/* Remove the PRESENT state of the device */
 	netif_device_detach(dev);
 
-	pci_save_state(pdev, priv->pm_state);
+	pci_save_state(pdev);
 	pci_disable_device(pdev);       // needed?
 	pci_set_power_state(pdev, state);
 	
@@ -6686,7 +6693,7 @@
 	       dev->name);
 
 	pci_set_power_state(pdev, 0);
-	pci_restore_state(pdev, priv->pm_state);
+	pci_restore_state(pdev);
 
 	/*
 	 * Suspend/Resume resets the PCI configuration space, so we have to