diff options
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
-rw-r--r-- | drivers/net/wireless/b43/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 0f628a29d833..3bf74e236abc 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -815,7 +815,7 @@ void b43_dummy_transmission(struct b43_wldev *dev) | |||
815 | break; | 815 | break; |
816 | udelay(10); | 816 | udelay(10); |
817 | } | 817 | } |
818 | for (i = 0x00; i < 0x0A; i++) { | 818 | for (i = 0x00; i < 0x19; i++) { |
819 | value = b43_read16(dev, 0x0690); | 819 | value = b43_read16(dev, 0x0690); |
820 | if (!(value & 0x0100)) | 820 | if (!(value & 0x0100)) |
821 | break; | 821 | break; |
@@ -4543,9 +4543,11 @@ static void b43_sprom_fixup(struct ssb_bus *bus) | |||
4543 | pdev = bus->host_pci; | 4543 | pdev = bus->host_pci; |
4544 | if (IS_PDEV(pdev, BROADCOM, 0x4318, ASUSTEK, 0x100F) || | 4544 | if (IS_PDEV(pdev, BROADCOM, 0x4318, ASUSTEK, 0x100F) || |
4545 | IS_PDEV(pdev, BROADCOM, 0x4320, DELL, 0x0003) || | 4545 | IS_PDEV(pdev, BROADCOM, 0x4320, DELL, 0x0003) || |
4546 | IS_PDEV(pdev, BROADCOM, 0x4320, HP, 0x12f8) || | ||
4546 | IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0015) || | 4547 | IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0015) || |
4547 | IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0014) || | 4548 | IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0014) || |
4548 | IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0013)) | 4549 | IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0013) || |
4550 | IS_PDEV(pdev, BROADCOM, 0x4320, MOTOROLA, 0x7010)) | ||
4549 | bus->sprom.boardflags_lo &= ~B43_BFL_BTCOEXIST; | 4551 | bus->sprom.boardflags_lo &= ~B43_BFL_BTCOEXIST; |
4550 | } | 4552 | } |
4551 | } | 4553 | } |