The following commit has been merged in the batman-adv/next branch: commit 85ce5ae52690aab0b3a4a6e9a1c2f951d2d8a5cc Author: Rafał Miłecki zajec5@gmail.com Date: Wed Aug 8 19:10:16 2012 +0200

b43legacy: fix logic in GPIO init

Signed-off-by: Rafał Miłecki zajec5@gmail.com Signed-off-by: John W. Linville linville@tuxdriver.com

diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index 8156135..3ea1a85 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c @@ -1920,7 +1920,7 @@ static int b43legacy_gpio_init(struct b43legacy_wldev *dev) return 0; ssb_write32(gpiodev, B43legacy_GPIO_CONTROL, (ssb_read32(gpiodev, B43legacy_GPIO_CONTROL) - & mask) | set); + & ~mask) | set);

return 0; }