patch-2.1.103 linux/drivers/net/tulip.c

Next file: linux/drivers/pci/oldproc.c
Previous file: linux/drivers/net/sdla.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.102/linux/drivers/net/tulip.c linux/drivers/net/tulip.c
@@ -472,11 +472,12 @@
 			if (pcibios_find_class
 				(PCI_CLASS_NETWORK_ETHERNET << 8,
 				 reverse_probe ? 0xfe - pci_index : pci_index,
-				 &pci_bus, &pci_device_fn) != PCIBIOS_SUCCESSFUL)
+				 &pci_bus, &pci_device_fn) != PCIBIOS_SUCCESSFUL) {
 				if (reverse_probe)
 					continue;
 				else
 					break;
+			}
 			pcibios_read_config_word(pci_bus, pci_device_fn,
 									 PCI_VENDOR_ID, &vendor);
 			pcibios_read_config_word(pci_bus, pci_device_fn,
@@ -1658,13 +1659,15 @@
 		   dev->name, inl(ioaddr + CSR5), csr12,
 		   inl(ioaddr + CSR13), inl(ioaddr + CSR14));
 	tp->mediasense = 1;
-	if (dev->if_port == 1 || dev->if_port == 2)
+
+	if (dev->if_port == 1 || dev->if_port == 2) {
 		if (csr12 & 0x0004) {
 			dev->if_port = 2 - dev->if_port;
 		} else
 			dev->if_port = 0;
-	else
+	} else
 		dev->if_port = 1;
+
 	select_media(dev, 0);
 	tp->stats.tx_errors++;
 	dev->trans_start = jiffies;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov