projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[linux-2.6-block.git]
/
drivers
/
net
/
ethernet
/
stmicro
/
stmmac
/
stmmac_main.c
diff --git
a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 93cf4f63f42646c60c7c4e29eb147ec07db8fd1e..110ca1c766d641cbd78b60ef5e93b1497298eb09 100644
(file)
--- a/
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@
-1704,7
+1704,7
@@
static int stmmac_open(struct net_device *dev)
if (ret) {
pr_err("%s: Cannot attach to PHY (error: %d)\n",
__func__, ret);
-
goto phy_error
;
+
return ret
;
}
}
@@
-1779,8
+1779,6
@@
init_error:
dma_desc_error:
if (priv->phydev)
phy_disconnect(priv->phydev);
-phy_error:
- clk_disable_unprepare(priv->stmmac_clk);
return ret;
}