diff options
| author |   Scott Wood <scottwood@freescale.com> | 2008-02-15 15:08:04 -0600 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2008-02-23 23:55:00 -0500 |
| commit | 5bd3670f31f1c58f500e55c4cdbc243fb4b2e3df (patch) | |
| tree | bd685eeec07032faa5cb3f2184e8bae5873d5b99 /drivers/net/fs_enet | |
| parent | ehea: add kdump support (diff) | |
| download | linux-dev-5bd3670f31f1c58f500e55c4cdbc243fb4b2e3df.tar.xz linux-dev-5bd3670f31f1c58f500e55c4cdbc243fb4b2e3df.zip | |
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: Scott Wood <scottwood@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/fs_enet')
| -rw-r--r-- | drivers/net/fs_enet/fs_enet-main.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index 42d94edeee26..af869cf9ae7d 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c @@ -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); |