Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 139112
b: refs/heads/master
c: 129dd96
h: refs/heads/master
v: v3
  • Loading branch information
David S. Miller committed Mar 29, 2009
1 parent dcefc32 commit bb25d68
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ee76db5e9e9896312f001790855a798472440328
refs/heads/master: 129dd9677b30a07bb832247dfe8d6089f1ac61a0
11 changes: 6 additions & 5 deletions trunk/drivers/net/ucc_geth.c
Original file line number Diff line number Diff line change
Expand Up @@ -3648,15 +3648,16 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
mdio = of_get_parent(phy);

if (mdio == NULL)
return -1;
return -ENODEV;

err = of_address_to_resource(mdio, 0, &res);
of_node_put(mdio);

if (err)
return -1;

if (err) {
of_node_put(mdio);
return err;
}
fsl_pq_mdio_bus_name(bus_name, mdio);
of_node_put(mdio);
snprintf(ug_info->phy_bus_id, sizeof(ug_info->phy_bus_id),
"%s:%02x", bus_name, *prop);
}
Expand Down

0 comments on commit bb25d68

Please sign in to comment.