Skip to content

Commit

Permalink
ucc_geth: Fix use-after-of_node_put() in ucc_geth_probe().
Browse files Browse the repository at this point in the history
We can't put 'mdio' until after we've used it in the
fsl_pq_mdio_bus_name() call.

Also fix error return values.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Mar 29, 2009
1 parent ee76db5 commit 129dd96
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions 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 129dd96

Please sign in to comment.