Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bd3670f authored by Scott Wood's avatar Scott Wood Committed by Jeff Garzik
Browse files

fs_enet: Don't call phy_mii_ioctl() in atomic context. 



The lock acquisition in fs_ioctl() does not appear to actually be necessary,
and thus is simply removed.

Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 21eee2dd

drivers/net/fs_enet/fs_enet-main.c

+1 −6
Original line number Diff line number Diff line
@@ -946,16 +946,11 @@ static int fs_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 
{

	struct fs_enet_private *fep = netdev_priv(dev);

	struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&rq->ifr_data;

	unsigned long flags;

	int rc;



	if (!netif_running(dev))

		return -EINVAL;



	spin_lock_irqsave(&fep->lock, flags);

	rc = phy_mii_ioctl(fep->phydev, mii, cmd);

	spin_unlock_irqrestore(&fep->lock, flags);

	return rc;

	return phy_mii_ioctl(fep->phydev, mii, cmd);

}



extern int fs_mii_connect(struct net_device *dev);