Skip to contentSkip to conversation

b43: Leds spinlock SMP compilefix

PATCH In review Michael Buesch 2 participants 3 messages Sep 29, 2007 – Oct 2, 2007 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 b43: Leds spinlock SMP compilefix

This was missing an address operator.

drivers/net/wireless/b43/leds.c +4 -4
Index: wireless-2.6/drivers/net/wireless/b43/leds.c
===================================================================
@@ -37,14 +37,14 @@ static void b43_led_turn_on(struct b43_w
 	unsigned long flags;
 	u16 ctl;
 
-	spin_lock_irqsave(wl->leds_lock, flags);
+	spin_lock_irqsave(&wl->leds_lock, flags);
 	ctl = b43_read16(dev, B43_MMIO_GPIO_CONTROL);
 	if (activelow)
 		ctl &= ~(1 << led_index);
 	else
 		ctl |= (1 << led_index);
 	b43_write16(dev, B43_MMIO_GPIO_CONTROL, ctl);
-	spin_unlock_irqrestore(wl->leds_lock, flags);
+	spin_unlock_irqrestore(&wl->leds_lock, flags);
 }
 
 static void b43_led_turn_off(struct b43_wldev *dev, u8 led_index,
@@ -54,14 +54,14 @@ static void b43_led_turn_off(struct b43_
 	unsigned long flags;
 	u16 ctl;
 
-	spin_lock_irqsave(wl->leds_lock, flags);
+	spin_lock_irqsave(&wl->leds_lock, flags);
 	ctl = b43_read16(dev, B43_MMIO_GPIO_CONTROL);
 	if (activelow)
 		ctl |= (1 << led_index);
 	else
 		ctl &= ~(1 << led_index);
 	b43_write16(dev, B43_MMIO_GPIO_CONTROL, ctl);
-	spin_unlock_irqrestore(wl->leds_lock, flags);
+	spin_unlock_irqrestore(&wl->leds_lock, flags);
 }
 
 /* Callback from the LED subsystem. */
#1 lore raw

I'll just roll this into the "b43: LED triggers support" patch.

Thanks,

John

Quoted 42 lines · Michael Buesch

This was missing an address operator.

Index: wireless-2.6/drivers/net/wireless/b43/leds.c
===================================================================

drivers/net/wireless/b43/leds.c +4 -4
@@ -37,14 +37,14 @@ static void b43_led_turn_on(struct b43_w
 	unsigned long flags;
 	u16 ctl;
 
-	spin_lock_irqsave(wl->leds_lock, flags);
+	spin_lock_irqsave(&wl->leds_lock, flags);
 	ctl = b43_read16(dev, B43_MMIO_GPIO_CONTROL);
 	if (activelow)
 		ctl &= ~(1 << led_index);
 	else
 		ctl |= (1 << led_index);
 	b43_write16(dev, B43_MMIO_GPIO_CONTROL, ctl);
-	spin_unlock_irqrestore(wl->leds_lock, flags);
+	spin_unlock_irqrestore(&wl->leds_lock, flags);
 }
 
 static void b43_led_turn_off(struct b43_wldev *dev, u8 led_index,
@@ -54,14 +54,14 @@ static void b43_led_turn_off(struct b43_
 	unsigned long flags;
 	u16 ctl;
 
-	spin_lock_irqsave(wl->leds_lock, flags);
+	spin_lock_irqsave(&wl->leds_lock, flags);
 	ctl = b43_read16(dev, B43_MMIO_GPIO_CONTROL);
 	if (activelow)
 		ctl |= (1 << led_index);
 	else
 		ctl &= ~(1 << led_index);
 	b43_write16(dev, B43_MMIO_GPIO_CONTROL, ctl);
-	spin_unlock_irqrestore(wl->leds_lock, flags);
+	spin_unlock_irqrestore(&wl->leds_lock, flags);
 }
 
 /* Callback from the LED subsystem. */
Signature · 2 lines
John W. Linville
[email protected]
#2 lore raw
Quoted 1 line · On Tuesday 02 October 2007 22:20:53 John W. Linville wrote:

I'll just roll this into the "b43: LED triggers support" patch.

Yep, thanks a lot.

Signature · 1 line
Greetings Michael.