diff options
| author | Luciano Coelho <coelho@ti.com> | 2011-12-05 21:52:22 +0400 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2012-04-12 09:44:01 +0400 |
| commit | 5453dc105a1f0b3204d61eda9af75faba6ae4df4 (patch) | |
| tree | e7a5a12c6040821878bb15686b8810986152f739 /drivers/net/wireless/ti/wlcore/acx.c | |
| parent | 166b213626067c3128e196a558a0cb318344b411 (diff) | |
| download | linux-5453dc105a1f0b3204d61eda9af75faba6ae4df4.tar.xz | |
wlcore/wl12xx: use a single memory config and reset if using wl127x
Instead of having two memory configuration sets, one for wl127x and
one for wl128x, we can use only one which should be correctly set by
the lower driver.
The wl12xx driver now uses the wl128x memory config by default but
changes it when if it identifies the wl127x chips.
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/ti/wlcore/acx.c')
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/acx.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/ti/wlcore/acx.c b/drivers/net/wireless/ti/wlcore/acx.c index 01dba462e521..9ad8fd5847b6 100644 --- a/drivers/net/wireless/ti/wlcore/acx.c +++ b/drivers/net/wireless/ti/wlcore/acx.c @@ -968,10 +968,7 @@ int wl12xx_acx_mem_cfg(struct wl1271 *wl) goto out; } - if (wl->chip.id == CHIP_ID_1283_PG20) - mem = &wl->conf.mem_wl128x; - else - mem = &wl->conf.mem_wl127x; + mem = &wl->conf.mem; /* memory config */ mem_conf->num_stations = mem->num_stations; |