b43: fix support for 14e4:4321 PCI dev with BCM4321 chipset

[android-x86/kernel.git] / drivers / net / wireless / b43 / main.c

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index f409929..9556454 100644 (file)
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -5361,6 +5361,10 @@ static void b43_supported_bands(struct b43_wldev *dev, bool *have_2ghz_phy,
                *have_5ghz_phy = true;
                return;
        case 0x4321: /* BCM4306 */
+               /* There are 14e4:4321 PCI devs with 2.4 GHz BCM4321 (N-PHY) */
+               if (dev->phy.type != B43_PHYTYPE_G)
+                       break;
+               /* fall through */
        case 0x4313: /* BCM4311 */
        case 0x431a: /* BCM4318 */
        case 0x432a: /* BCM4321 */