diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 04:51:26 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 04:51:26 -0500 |
| commit | 62d65a8062530a4b2673999deb9be368fa60ca87 (patch) | |
| tree | 89ccd9b8de02b247f145275311378280ae26cdfb /drivers/net/wireless | |
| parent | f89b23217372ed9bdba8804c1616d445402d1e05 (diff) | |
| parent | ea182d4aefa3a27847d890b1592a608d1180aa45 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/airo.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/orinoco.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 6c4aa7b6a21..ee866fd6957 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -2755,8 +2755,8 @@ static struct net_device *_init_airo_card( unsigned short irq, int port, SET_NETDEV_DEV(dev, dmdev); - if (test_bit(FLAG_MPI,&ai->flags)) - reset_card (dev, 1); + reset_card (dev, 1); + msleep(400); rc = request_irq( dev->irq, airo_interrupt, SA_SHIRQ, dev->name, dev ); if (rc) { diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index 488ab06fb79..6fd0bf73683 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c @@ -3512,9 +3512,8 @@ static int orinoco_ioctl_setpower(struct net_device *dev, break; default: err = -EINVAL; - } - if (err) goto out; + } if (prq->flags & IW_POWER_TIMEOUT) { priv->pm_on = 1; |