[parisc-linux-cvs] pdc_lan_station_id changes

Matthew Wilcox willy@ldl.fc.hp.com
Tue, 02 Oct 2001 20:49:28 -0600


Index: drivers/net/lasi_82596.c
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/net/lasi_82596.c,v
retrieving revision 1.22
diff -u -p -r1.22 lasi_82596.c
--- drivers/net/lasi_82596.c	2001/08/28 00:00:23	1.22
+++ drivers/net/lasi_82596.c	2001/10/03 02:37:08
@@ -1169,15 +1169,16 @@ static int __init i82596_probe(struct ne
 	}
 
 	if (!dev->base_addr || !dev->irq)
-	    return -ENODEV;
+		return -ENODEV;
 
-	if (pdc_lan_station_id( (char*)&eth_addr, (void*)dev->base_addr)) {
-	    for(i=0;i<6;i++)
-		eth_addr[i] = gsc_readb(LAN_PROM_ADDR+i);
-	    printk("82596.c: MAC of HP700 LAN blindely read from the prom!\n");
+	if (pdc_lan_station_id(eth_addr, dev->base_addr)) {
+		for (i=0; i < 6; i++) {
+			eth_addr[i] = gsc_readb(LAN_PROM_ADDR + i);
+		}
+		printk("82596.c: MAC of HP700 LAN read from EEPROM\n");
 	}
 
-	dev->mem_start = (int)pci_alloc_consistent( NULL, 
+	dev->mem_start = (int)pci_alloc_consistent(NULL, 
 		sizeof(struct i596_private), &dma_addr);
 	if (!dev->mem_start) {
 		printk("%s: Couldn't get consistent shared memory\n", dev->name);