commit f1a6391594ce25d2ff8a0479e9dc461354b585f3
author Ed James <edjames@google.com> Thu Mar 05 20:02:49 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 05 20:02:50 2015 +0000
tree 24b0587050ef2cc3876806075bb6a1118bbf7b8e
parent 816f6884cbd46a442ea77184c8eb6bb690745a70
parent c9bce10df3e0a3d3d48799d9bb02ccda0a3995a3

Merge "gfrm200: fix live button" into newkernel_dev

drivers/net/ethernet/broadcom/genet/bcmmii.c

diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
index 21f2170..321d401 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
@@ -454,11 +454,8 @@
 static int bcmgenet_fixed_phy_link_update(struct net_device *dev,
 					  struct fixed_phy_status *status)
 {
-        struct bcmgenet_priv *priv = netdev_priv(dev);
-        struct phy_device *phydev = priv->phydev;
-
-	if (phydev)
-		status->link = !!phydev->link;
+	if (dev && dev->phydev && status)
+		status->link = !!dev->phydev->link;
 
 	return 0;
 }