Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
This commit is contained in:
@@ -113,12 +113,14 @@ static int mdio_mux_mmioreg_probe(struct platform_device *pdev)
|
||||
if (!iprop || len != sizeof(uint32_t)) {
|
||||
dev_err(&pdev->dev, "mdio-mux child node %s is "
|
||||
"missing a 'reg' property\n", np2->full_name);
|
||||
of_node_put(np2);
|
||||
return -ENODEV;
|
||||
}
|
||||
if (be32_to_cpup(iprop) & ~s->mask) {
|
||||
dev_err(&pdev->dev, "mdio-mux child node %s has "
|
||||
"a 'reg' value with unmasked bits\n",
|
||||
np2->full_name);
|
||||
of_node_put(np2);
|
||||
return -ENODEV;
|
||||
}
|
||||
}
|
||||
|
@@ -144,6 +144,7 @@ int mdio_mux_init(struct device *dev,
|
||||
dev_err(dev,
|
||||
"Error: Failed to allocate memory for child\n");
|
||||
ret_val = -ENOMEM;
|
||||
of_node_put(child_bus_node);
|
||||
break;
|
||||
}
|
||||
cb->bus_number = v;
|
||||
|
Reference in New Issue
Block a user