diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-20 04:46:02 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-20 04:46:02 -0400 |
| commit | 4b2d9cf00962d0a0e697f887f3ecaa155cbde555 (patch) | |
| tree | 3a64ad0825e82c3df0b4d84c412c647c19e34afb /drivers/net/wireless/bcm43xx/bcm43xx_leds.c | |
| parent | 4c1234ff24dd8dc2d9020d6315d91a71339be114 (diff) | |
| parent | 89c318ed3985da1271e00ad586f2dce8a6e75656 (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'drivers/net/wireless/bcm43xx/bcm43xx_leds.c')
| -rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_leds.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_leds.c b/drivers/net/wireless/bcm43xx/bcm43xx_leds.c index 4b2c02c0b31..ec80692d638 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_leds.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_leds.c @@ -51,12 +51,12 @@ static void bcm43xx_led_blink(unsigned long d) struct bcm43xx_private *bcm = led->bcm; unsigned long flags; - bcm43xx_lock_mmio(bcm, flags); + bcm43xx_lock_irqonly(bcm, flags); if (led->blink_interval) { bcm43xx_led_changestate(led); mod_timer(&led->blink_timer, jiffies + led->blink_interval); } - bcm43xx_unlock_mmio(bcm, flags); + bcm43xx_unlock_irqonly(bcm, flags); } static void bcm43xx_led_blink_start(struct bcm43xx_led *led, |