Merge branch 'tmp' into upstream

[linux-2.6-omap-h63xx.git] / drivers / net / sunlance.c

diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index 0e3fdf7c6dd3a8cf321a063d61876a39d58b2c1d..ec0413609f36fd6b4bc8175f64e06bd330bb4157 100644 (file)
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -1566,20 +1566,21 @@ static int __exit sunlance_sun4_remove(void)
 static int __devinit sunlance_sbus_probe(struct of_device *dev, const struct of_device_id *match)
 {
        struct sbus_dev *sdev = to_sbus_device(&dev->dev);
-       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")) {
-               struct sbus_dma *ledma = find_ledma(sdev);
+       if (sdev->parent) {
+               struct of_device *parent = &sdev->parent->ofdev;
 
-               err = sparc_lance_probe_one(sdev->child, ledma, NULL);
-       } else {
-               BUG_ON(strcmp(dp->name, "lebuffer"));
+               if (!strcmp(parent->node->name, "ledma")) {
+                       struct sbus_dma *ledma = find_ledma(to_sbus_device(&parent->dev));
 
-               err = sparc_lance_probe_one(sdev->child, NULL, sdev);
-       }
+                       err = sparc_lance_probe_one(sdev, ledma, NULL);
+               } else if (!strcmp(parent->node->name, "lebuffer")) {
+                       err = sparc_lance_probe_one(sdev, NULL, to_sbus_device(&parent->dev));
+               } else
+                       err = sparc_lance_probe_one(sdev, NULL, NULL);
+       } else
+               err = sparc_lance_probe_one(sdev, NULL, NULL);
 
        return err;
 }
@@ -1604,12 +1605,6 @@ static struct of_device_id sunlance_sbus_match[] = {
        {
                .name = "le",
        },
-       {
-               .name = "ledma",
-       },
-       {
-               .name = "lebuffer",
-       },
        {},
 };