提交 404dda85 编写于 作者: K Krzysztof Helt 提交者: David S. Miller

[SUNLANCE]: Fix probing problem.

The current probe table causes ledma and lebuffer
"le" devices to get probed twice which is not what
we want.

Match just "le" and look directly at the parent to get the correct
top-level node information.
Signed-off-by: NKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 47f2c360
...@@ -1566,20 +1566,21 @@ static int __exit sunlance_sun4_remove(void) ...@@ -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) 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 sbus_dev *sdev = to_sbus_device(&dev->dev);
struct device_node *dp = dev->node;
int err; int err;
if (!strcmp(dp->name, "le")) { if (sdev->parent) {
err = sparc_lance_probe_one(sdev, NULL, NULL); struct of_device *parent = &sdev->parent->ofdev;
} else if (!strcmp(dp->name, "ledma")) {
struct sbus_dma *ledma = find_ledma(sdev);
err = sparc_lance_probe_one(sdev->child, ledma, NULL); if (!strcmp(parent->node->name, "ledma")) {
} else { struct sbus_dma *ledma = find_ledma(to_sbus_device(&parent->dev));
BUG_ON(strcmp(dp->name, "lebuffer"));
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; return err;
} }
...@@ -1604,12 +1605,6 @@ static struct of_device_id sunlance_sbus_match[] = { ...@@ -1604,12 +1605,6 @@ static struct of_device_id sunlance_sbus_match[] = {
{ {
.name = "le", .name = "le",
}, },
{
.name = "ledma",
},
{
.name = "lebuffer",
},
{}, {},
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册