← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/net/wireless/wl12xx/testmode.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/wireless/wl12xx/testmode.c
27
27
 
28
28
#include "wl12xx.h"
29
29
#include "acx.h"
 
30
#include "reg.h"
30
31
 
31
32
#define WL1271_TM_MAX_DATA_LENGTH 1024
32
33
 
204
205
 
205
206
        kfree(wl->nvs);
206
207
 
207
 
        if (len != sizeof(struct wl1271_nvs_file))
 
208
        if ((wl->chip.id == CHIP_ID_1283_PG20) &&
 
209
            (len != sizeof(struct wl128x_nvs_file)))
 
210
                return -EINVAL;
 
211
        else if (len != sizeof(struct wl1271_nvs_file))
208
212
                return -EINVAL;
209
213
 
210
214
        wl->nvs = kzalloc(len, GFP_KERNEL);