]> git.hungrycats.org Git - linux/commitdiff
[PATCH] wireless airo oops fix
authorJeff Garzik <jgarzik@pobox.com>
Sun, 7 Dec 2003 03:00:48 +0000 (19:00 -0800)
committerLinus Torvalds <torvalds@home.osdl.org>
Sun, 7 Dec 2003 03:00:48 +0000 (19:00 -0800)
From Javier Achirica:

Delay MIC activation to prevent Oops

drivers/net/wireless/airo.c

index e87dbaacf0a34a91c5276492c26d2d0e9cd02ca5..d2d7dba7927c282b779c619ce1f34fd2ce42ad2e 100644 (file)
@@ -2466,11 +2466,8 @@ static irqreturn_t airo_interrupt ( int irq, void* dev_id, struct pt_regs *regs)
                        OUT4500( apriv, EVACK, EV_MIC );
 #ifdef MICSUPPORT
                        if (test_bit(FLAG_MIC_CAPABLE, &apriv->flags)) {
-                               if (down_trylock(&apriv->sem) != 0) {
-                                       set_bit(JOB_MIC, &apriv->flags);
-                                       wake_up_interruptible(&apriv->thr_wait);
-                               } else
-                                       micinit (apriv);
+                               set_bit(JOB_MIC, &apriv->flags);
+                               wake_up_interruptible(&apriv->thr_wait);
                        }
 #endif
                }