patch-2.4.4 linux/drivers/net/aironet4500_card.c

Next file: linux/drivers/net/am79c961a.c
Previous file: linux/drivers/net/acenic.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.3/linux/drivers/net/aironet4500_card.c linux/drivers/net/aironet4500_card.c
@@ -128,17 +128,12 @@
 //		request_region(pci_cisaddr, AIRONET4X00_CIS_SIZE, "aironet4x00 cis");
 //		request_region(pci_memaddr, AIRONET4X00_MEM_SIZE, "aironet4x00 mem");
 
-//		pci_write_config_word(pdev, PCI_COMMAND, 0);
-		udelay(10000);
+		mdelay(10);
 
 		pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
-		new_command = pci_command |0x100 | PCI_COMMAND_MEMORY|PCI_COMMAND_IO;
-		if (pci_command != new_command) {
-			printk(KERN_INFO "  The PCI BIOS has not enabled this"
-				   " device!  Updating PCI command %4.4x->%4.4x.\n",
-				   pci_command, new_command);
+		new_command = pci_command | PCI_COMMAND_SERR;
+		if (pci_command != new_command)
 			pci_write_config_word(pdev, PCI_COMMAND, new_command);
-		}
 
 
 /*		if (device == PCI_DEVICE_AIRONET_4800)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)