Skip to content

Commit

Permalink
mvneta: dont call mvneta_adjust_link() manually
Browse files Browse the repository at this point in the history
mvneta_adjust_link() is a callback for of_phy_connect() and should
not be called directly. The result of calling it directly is as below:

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
stsp authored and davem330 committed Apr 6, 2015
1 parent f60e599 commit ecf7b36
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions drivers/net/ethernet/marvell/mvneta.c
Original file line number Diff line number Diff line change
Expand Up @@ -2658,16 +2658,11 @@ static int mvneta_stop(struct net_device *dev)
static int mvneta_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
struct mvneta_port *pp = netdev_priv(dev);
int ret;

if (!pp->phy_dev)
return -ENOTSUPP;

ret = phy_mii_ioctl(pp->phy_dev, ifr, cmd);
if (!ret)
mvneta_adjust_link(dev);

return ret;
return phy_mii_ioctl(pp->phy_dev, ifr, cmd);
}

/* Ethtool methods */
Expand Down

0 comments on commit ecf7b36

Please sign in to comment.