999-b43_limit_controlled_leds_by_Niels.patch

--- a/drivers/net/wireless/b43/leds.c
+++ b/drivers/net/wireless/b43/leds.c
@@ -199,7 +199,7 @@ void b43_leds_init(struct b43_wldev *dev
 	sprom[2] = bus->sprom.gpio2;
 	sprom[3] = bus->sprom.gpio3;
 
-	for (i = 0; i < 4; i++) {
+	for (i = 0; i < 2; i++) {
 		if (sprom[i] == 0xFF) {
 			/* There is no LED information in the SPROM
 			 * for this LED. Hardcode it here. */
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2397,11 +2397,11 @@ static int b43_gpio_init(struct b43_wlde
 		    & ~B43_MACCTL_GPOUTSMSK);
 
 	b43_write16(dev, B43_MMIO_GPIO_MASK, b43_read16(dev, B43_MMIO_GPIO_MASK)
-		    | 0x000F);
+		    | 0x0003);
 
-	mask = 0x0000001F;
-	set = 0x0000000F;
-	if (dev->dev->bus->chip_id == 0x4301) {
+	mask = 0x00000003;
+	set = 0x00000003;
+	if (0 /* dev->dev->bus->chip_id == 0x4301 */ ) {
 		mask |= 0x0060;
 		set |= 0x0060;
 	}
@@ -2412,14 +2412,14 @@ static int b43_gpio_init(struct b43_wlde
 		mask |= 0x0180;
 		set |= 0x0180;
 	}
-	if (dev->dev->bus->sprom.boardflags_lo & B43_BFL_PACTRL) {
+	if (0 /* dev->dev->bus->sprom.boardflags_lo & B43_BFL_PACTRL */ ) {
 		b43_write16(dev, B43_MMIO_GPIO_MASK,
 			    b43_read16(dev, B43_MMIO_GPIO_MASK)
 			    | 0x0200);
 		mask |= 0x0200;
 		set |= 0x0200;
 	}
-	if (dev->dev->id.revision >= 2)
+	if (0 /* dev->dev->id.revision >= 2 */ )
 		mask |= 0x0010;	/* FIXME: This is redundant. */
 
 #ifdef CONFIG_SSB_DRIVER_PCICORE
@@ -2430,7 +2430,7 @@ static int b43_gpio_init(struct b43_wlde
 		return 0;
 	ssb_write32(gpiodev, B43_GPIO_CONTROL,
 		    (ssb_read32(gpiodev, B43_GPIO_CONTROL)
-		     & mask) | set);
+		     & ~mask) | (set & mask));
 
 	return 0;
 }