diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-06-13 09:01:22 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-06-13 09:01:28 +0200 |
| commit | 627ae3ddd6f929b4496502318a8896729fc37839 (patch) | |
| tree | 269fc2ea3b49c16864e97ee6b2ed0e7530bed79a /drivers/bcma/sprom.c | |
| parent | 7bc057ffb5078d3e7f391ef2357f4ab01b9694e0 (diff) | |
| parent | a59f975a78f0606a3a364939dfa9b949d5f87521 (diff) | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/bcma/sprom.c')
| -rw-r--r-- | drivers/bcma/sprom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bcma/sprom.c b/drivers/bcma/sprom.c index c7f93359acb..f16f42d3607 100644 --- a/drivers/bcma/sprom.c +++ b/drivers/bcma/sprom.c @@ -579,13 +579,13 @@ int bcma_sprom_get(struct bcma_bus *bus) if (!sprom) return -ENOMEM; - if (bus->chipinfo.id == 0x4331) + if (bus->chipinfo.id == 0x4331 || bus->chipinfo.id == 43431) bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, false); pr_debug("SPROM offset 0x%x\n", offset); bcma_sprom_read(bus, offset, sprom); - if (bus->chipinfo.id == 0x4331) + if (bus->chipinfo.id == 0x4331 || bus->chipinfo.id == 43431) bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, true); err = bcma_sprom_valid(sprom); |