Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14884
b: refs/heads/master
c: 3410572
h: refs/heads/master
v: v3
  • Loading branch information
Francois Romieu committed Nov 30, 2005
1 parent 1303164 commit 9a3b622
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d9e2d185bf01e20339158f77c3fca00b02014912
refs/heads/master: 3410572d519b6c68505f746f25033de97809eaa1
7 changes: 5 additions & 2 deletions trunk/drivers/net/b44.c
Original file line number Diff line number Diff line change
Expand Up @@ -1838,12 +1838,15 @@ static int b44_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
struct mii_ioctl_data *data = if_mii(ifr);
struct b44 *bp = netdev_priv(dev);
int err;
int err = -EINVAL;

if (!netif_running(dev))
goto out;

spin_lock_irq(&bp->lock);
err = generic_mii_ioctl(&bp->mii_if, data, cmd, NULL);
spin_unlock_irq(&bp->lock);

out:
return err;
}

Expand Down

0 comments on commit 9a3b622

Please sign in to comment.