---

yaml --- r: 291131 b: refs/heads/master c: 5809802 h: refs/heads/master i: 291129: c079115 291127: 42cccb0 v: v3
git-mirror · Mar 5, 2012 · 542e60b · 542e60b
1 parent 131b3f9
commit 542e60b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a01f0c08d20a2b1356c1cb90ef97a0dc412b64c
+refs/heads/master: 5809802180b2b638762465cbad3f51a9ac8ff0b3
diff --git a/trunk/drivers/net/wireless/b43/main.c b/trunk/drivers/net/wireless/b43/main.c
@@ -2706,6 +2706,8 @@ static int b43_gpio_init(struct b43_wldev *dev)
 		mask |= 0x0060;
 		set |= 0x0060;
 	}
+	if (dev->dev->chip_id == 0x5354)
+		set &= 0xff02;
 	if (0 /* FIXME: conditional unknown */ ) {
 		b43_write16(dev, B43_MMIO_GPIO_MASK,
 			    b43_read16(dev, B43_MMIO_GPIO_MASK)