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/airo.c | |
| parent | f89b23217372ed9bdba8804c1616d445402d1e05 (diff) | |
| parent | ea182d4aefa3a27847d890b1592a608d1180aa45 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/wireless/airo.c')
| -rw-r--r-- | drivers/net/wireless/airo.c | 4 |
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, | |||
| 2755 | SET_NETDEV_DEV(dev, dmdev); | 2755 | SET_NETDEV_DEV(dev, dmdev); |
| 2756 | 2756 | ||
| 2757 | 2757 | ||
| 2758 | if (test_bit(FLAG_MPI,&ai->flags)) | 2758 | reset_card (dev, 1); |
| 2759 | reset_card (dev, 1); | 2759 | msleep(400); |
| 2760 | 2760 | ||
| 2761 | rc = request_irq( dev->irq, airo_interrupt, SA_SHIRQ, dev->name, dev ); | 2761 | rc = request_irq( dev->irq, airo_interrupt, SA_SHIRQ, dev->name, dev ); |
| 2762 | if (rc) { | 2762 | if (rc) { |