From: Grant Likely Date: Tue, 28 Apr 2009 09:11:53 +0000 (-0700) Subject: net: Fix ucc_geth.c handling of fixed-link w/o phy-connection-type property. X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8555a5948467e941acc34e8b1c30df4c1f2f5862;p=mv-sheeva.git 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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index a5362846663..f18017dc025 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];