[PATCH] sunlance probing problem

["Krzysztof Helt" <krzysztof.h1@wp.pl>]

[-- Attachment #1: Type: text/plain, Size: 660 bytes --]

From: Krzysztof Helt (krzysztof.h1@wp.pl)

The patch removes the "le" device from matching list of probed
devices.

Signed-off-by: Krzysztof Helt (krzysztof.h1@wp.pl)
---
The sunlance driver allows probing of three devices: le, ledma
and lebuffer. The "le" device is a child entry for either ledma
or lebuffer devices. Thus, each Ethernet adapter is probed twice
and registered as two Ethernet adapters.

I tested it on SS20 and 2.6.18-rc4 kernel.



----------------------------------------------------
Czy 10 minut rozmowy = ponad 11 zł oszczędności ?
Sprawdź: http://klik.wp.pl/?adr=http%3A%2F%2Ftelefon.wp.pl%2Foszczednosci.html&sid=842

[-- Attachment #2: lance-id.patch --]
[-- Type: application/octet-stream, Size: 705 bytes --]

diff -ur linux-2.6.17/drivers/net/sunlance.c linux-new/drivers/net/sunlance.c
--- linux-2.6.17/drivers/net/sunlance.c	2006-08-10 08:58:34.000000000 +0200
+++ linux-new/drivers/net/sunlance.c	2006-08-11 23:33:11.000000000 +0200
@@ -1569,9 +1569,7 @@
 	struct device_node *dp = dev->node;
 	int err;
 
-	if (!strcmp(dp->name, "le")) {
-		err = sparc_lance_probe_one(sdev, NULL, NULL);
-	} else if (!strcmp(dp->name, "ledma")) {
+	if (!strcmp(dp->name, "ledma")) {
 		struct sbus_dma *ledma = find_ledma(sdev);
 
 		err = sparc_lance_probe_one(sdev->child, ledma, NULL);
@@ -1602,9 +1600,6 @@
 
 static struct of_device_id sunlance_sbus_match[] = {
 	{
-		.name = "le",
-	},
-	{
 		.name = "ledma",
 	},
 	{