lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ucc_geth: Fix use-after-of_node_put() in ucc_geth_probe().

Browse Source 
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>
This commit is contained in:
David S. Miller
2009-03-29 01:20:18 -07:00
parent ee76db5e9e
commit 129dd9677b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/ucc_geth.c
View File

@@ -3648,15 +3648,16 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
mdio = of_get_parent(phy); mdio = of_get_parent(phy);
if (mdio == NULL) if (mdio == NULL)
return -1; return -ENODEV;
err = of_address_to_resource(mdio, 0, &res); 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); fsl_pq_mdio_bus_name(bus_name, mdio);
of_node_put(mdio);
snprintf(ug_info->phy_bus_id, sizeof(ug_info->phy_bus_id), snprintf(ug_info->phy_bus_id, sizeof(ug_info->phy_bus_id),
"%s:%02x", bus_name, *prop); "%s:%02x", bus_name, *prop);
} }