]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
net: Fix ucc_geth.c handling of fixed-link w/o phy-connection-type property.
authorGrant Likely <grant.likely@secretlab.ca>
Tue, 28 Apr 2009 09:11:53 +0000 (02:11 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 28 Apr 2009 09:11:53 +0000 (02:11 -0700)
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>
drivers/net/ucc_geth.c

index a536284666378ee7d01cbab00181b2f5cbfb6904..f18017dc025509c235e8b3f4469a30ea3aa66b34 100644 (file)
@@ -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];