diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2009-04-28 11:11:53 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-28 11:11:53 +0200 |
| commit | 8555a5948467e941acc34e8b1c30df4c1f2f5862 (patch) | |
| tree | 7e4c071c1265ecd7061033ddce6fb327936eff84 /drivers/net | |
| parent | fs_enet: Remove dead code (diff) | |
| download | linux-8555a5948467e941acc34e8b1c30df4c1f2f5862.tar.xz linux-8555a5948467e941acc34e8b1c30df4c1f2f5862.zip | |
net: Fix ucc_geth.c handling of fixed-link w/o phy-connection-type property.
Previous rework to ucc_geth.c to add of_mdio support (net: Rework
ucc_geth driver to use of_mdio infrastructure) added a block of
code which broke older openfirmware device trees which this case.
This patch removes the offending blurb.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ucc_geth.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index a53628466637..f18017dc0255 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c @@ -3631,9 +3631,6 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma prop = of_get_property(np, "phy-connection-type", NULL); if (!prop) { /* handle interface property present in old trees */ - if (!phy) - return -ENODEV; - prop = of_get_property(phy, "interface", NULL); if (prop != NULL) { phy_interface = enet_to_phy_interface[*prop]; |