X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fsis900.c;h=be4465bc0a693d642c23ec465e3ce0ad035ad625;hb=b3e3b302cf6dc8d60b67f0e84d1fa5648889c038;hp=6cbefcae9ac2c844e6334390cb33a7ef8ddb3006;hpb=ccbf04f24c55ead791dac5df8ddeb1a640fbaad8;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 6cbefcae9ac..be4465bc0a6 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -509,10 +509,10 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
 	else
 		ret = sis900_get_mac_addr(pci_dev, net_dev);
 
-	if (ret == 0) {
-		printk(KERN_WARNING "%s: Cannot read MAC address.\n", dev_name);
-		ret = -ENODEV;
-		goto err_unmap_rx;
+	if (!ret || !is_valid_ether_addr(net_dev->dev_addr)) {
+		random_ether_addr(net_dev->dev_addr);
+		printk(KERN_WARNING "%s: Unreadable or invalid MAC address,"
+				"using random generated one\n", dev_name);
 	}
 
 	/* 630ET : set the mii access mode as software-mode */