projects
/
firefly-linux-kernel-4.4.55.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/s390/linux
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
freescale
/
gianfar.c
diff --git
a/drivers/net/ethernet/freescale/gianfar.c
b/drivers/net/ethernet/freescale/gianfar.c
index a6cf40e62f3a9c531f2997c34590fbe89d0ddc80..fb29d049f4e12b8df13bbe21ad44c8e73de1ea01 100644
(file)
--- a/
drivers/net/ethernet/freescale/gianfar.c
+++ b/
drivers/net/ethernet/freescale/gianfar.c
@@
-892,12
+892,12
@@
static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
/* In the case of a fixed PHY, the DT node associated
* to the PHY is the Ethernet MAC DT node.
*/
/* In the case of a fixed PHY, the DT node associated
* to the PHY is the Ethernet MAC DT node.
*/
- if (of_phy_is_fixed_link(np)) {
+ if (
!priv->phy_node &&
of_phy_is_fixed_link(np)) {
err = of_phy_register_fixed_link(np);
if (err)
goto err_grp_init;
err = of_phy_register_fixed_link(np);
if (err)
goto err_grp_init;
- priv->phy_node =
np
;
+ priv->phy_node =
of_node_get(np)
;
}
/* Find the TBI PHY. If it's not there, we don't support SGMII */
}
/* Find the TBI PHY. If it's not there, we don't support SGMII */
@@
-1435,10
+1435,8
@@
register_fail:
unmap_group_regs(priv);
gfar_free_rx_queues(priv);
gfar_free_tx_queues(priv);
unmap_group_regs(priv);
gfar_free_rx_queues(priv);
gfar_free_tx_queues(priv);
- if (priv->phy_node)
- of_node_put(priv->phy_node);
- if (priv->tbi_node)
- of_node_put(priv->tbi_node);
+ of_node_put(priv->phy_node);
+ of_node_put(priv->tbi_node);
free_gfar_dev(priv);
return err;
}
free_gfar_dev(priv);
return err;
}
@@
-1447,10
+1445,8
@@
static int gfar_remove(struct platform_device *ofdev)
{
struct gfar_private *priv = platform_get_drvdata(ofdev);
{
struct gfar_private *priv = platform_get_drvdata(ofdev);
- if (priv->phy_node)
- of_node_put(priv->phy_node);
- if (priv->tbi_node)
- of_node_put(priv->tbi_node);
+ of_node_put(priv->phy_node);
+ of_node_put(priv->tbi_node);
unregister_netdev(priv->ndev);
unmap_group_regs(priv);
unregister_netdev(priv->ndev);
unmap_group_regs(priv);