From 9a3b622f018576d02cf4b145b73c24ce195b4565 Mon Sep 17 00:00:00 2001 From: Francois Romieu Date: Wed, 30 Nov 2005 22:32:13 +0100 Subject: [PATCH] --- yaml --- r: 14884 b: refs/heads/master c: 3410572d519b6c68505f746f25033de97809eaa1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/b44.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 32babaad6678..14715da1d871 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9e2d185bf01e20339158f77c3fca00b02014912 +refs/heads/master: 3410572d519b6c68505f746f25033de97809eaa1 diff --git a/trunk/drivers/net/b44.c b/trunk/drivers/net/b44.c index c8d9b4d66704..e0ec777d96df 100644 --- a/trunk/drivers/net/b44.c +++ b/trunk/drivers/net/b44.c @@ -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; }