summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/airo.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-12-01 04:51:26 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-12-01 04:51:26 -0500
commit62d65a8062530a4b2673999deb9be368fa60ca87 (patch)
tree89ccd9b8de02b247f145275311378280ae26cdfb /drivers/net/wireless/airo.c
parentf89b23217372ed9bdba8804c1616d445402d1e05 (diff)
parentea182d4aefa3a27847d890b1592a608d1180aa45 (diff)
downloadtalos-op-linux-62d65a8062530a4b2673999deb9be368fa60ca87.tar.gz
talos-op-linux-62d65a8062530a4b2673999deb9be368fa60ca87.zip
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/wireless/airo.c')
-rw-r--r--drivers/net/wireless/airo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 6c4aa7b6a21b..ee866fd6957d 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) {
OpenPOWER on IntegriCloud