diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 10:32:20 +0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 10:32:20 +0400 |
| commit | 9fb4c7fbbcb1e947567d13b82e429ae47a46e337 (patch) | |
| tree | 6c5f11f347d0f58565381f92680a7a9cc63c0bd8 /drivers/net/wireless/wl12xx/testmode.c | |
| parent | dc3e5b6a6e842116ec2436161adf31877f09b6b9 (diff) | |
| parent | d762f4383100c2a87b1a3f2d678cd3b5425655b4 (diff) | |
| download | linux-9fb4c7fbbcb1e947567d13b82e429ae47a46e337.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/wireless/wl12xx/testmode.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/testmode.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/testmode.c b/drivers/net/wireless/wl12xx/testmode.c index 6ec06a4a4c6d..da351d7cd1f2 100644 --- a/drivers/net/wireless/wl12xx/testmode.c +++ b/drivers/net/wireless/wl12xx/testmode.c @@ -27,6 +27,7 @@ #include "wl12xx.h" #include "acx.h" +#include "reg.h" #define WL1271_TM_MAX_DATA_LENGTH 1024 @@ -204,7 +205,10 @@ static int wl1271_tm_cmd_nvs_push(struct wl1271 *wl, struct nlattr *tb[]) kfree(wl->nvs); - if (len != sizeof(struct wl1271_nvs_file)) + if ((wl->chip.id == CHIP_ID_1283_PG20) && + (len != sizeof(struct wl128x_nvs_file))) + return -EINVAL; + else if (len != sizeof(struct wl1271_nvs_file)) return -EINVAL; wl->nvs = kzalloc(len, GFP_KERNEL); |