projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[deliverable/linux.git]
/
drivers
/
net
/
ethernet
/
ethoc.c
diff --git
a/drivers/net/ethernet/ethoc.c
b/drivers/net/ethernet/ethoc.c
index 41b01064510098c00a66d86bb49cf2f3fe02f9c3..4edb98c3c6c70a9c620caa7928e8e5d555db1242 100644
(file)
--- a/
drivers/net/ethernet/ethoc.c
+++ b/
drivers/net/ethernet/ethoc.c
@@
-1195,7
+1195,7
@@
static int ethoc_probe(struct platform_device *pdev)
priv->mdio = mdiobus_alloc();
if (!priv->mdio) {
ret = -ENOMEM;
priv->mdio = mdiobus_alloc();
if (!priv->mdio) {
ret = -ENOMEM;
- goto free;
+ goto free
2
;
}
priv->mdio->name = "ethoc-mdio";
}
priv->mdio->name = "ethoc-mdio";
@@
-1208,7
+1208,7
@@
static int ethoc_probe(struct platform_device *pdev)
ret = mdiobus_register(priv->mdio);
if (ret) {
dev_err(&netdev->dev, "failed to register MDIO bus\n");
ret = mdiobus_register(priv->mdio);
if (ret) {
dev_err(&netdev->dev, "failed to register MDIO bus\n");
- goto free;
+ goto free
2
;
}
ret = ethoc_mdio_probe(netdev);
}
ret = ethoc_mdio_probe(netdev);
@@
-1241,9
+1241,10
@@
error2:
error:
mdiobus_unregister(priv->mdio);
mdiobus_free(priv->mdio);
error:
mdiobus_unregister(priv->mdio);
mdiobus_free(priv->mdio);
-free:
+free
2
:
if (priv->clk)
clk_disable_unprepare(priv->clk);
if (priv->clk)
clk_disable_unprepare(priv->clk);
+free:
free_netdev(netdev);
out:
return ret;
free_netdev(netdev);
out:
return ret;
This page took
0.023993 seconds
and
5
git commands to generate.