diff options
| author |   Julia Lawall <julia@diku.dk> | 2010-05-15 23:15:10 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2010-06-02 16:13:09 -0400 |
| commit | 80caf6017ace944035210ca2bba7abeb85eb0c5c (patch) | |
| tree | 02c32a1a502a1ed131a9cea4398ba776bd174ce7 /drivers/net/wireless/wl12xx/wl1251_main.c | |
| parent | drivers/net/wireless/libertas: Use kmemdup (diff) | |
| download | linux-dev-80caf6017ace944035210ca2bba7abeb85eb0c5c.tar.xz linux-dev-80caf6017ace944035210ca2bba7abeb85eb0c5c.zip | |
drivers/net/wireless/wl12xx: Use kmemdup
Use kmemdup when some other buffer is immediately copied into the
allocated region.
A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression from,to,size,flag;
statement S;
@@
- to = \(kmalloc\|kzalloc\)(size,flag);
+ to = kmemdup(from,size,flag);
if (to==NULL || ...) S
- memcpy(to, from, size);
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: Kalle Valo <kvalo@adurom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c index 00b24282fc73..c8f268951e10 100644 --- a/drivers/net/wireless/wl12xx/wl1251_main.c +++ b/drivers/net/wireless/wl12xx/wl1251_main.c @@ -124,7 +124,7 @@ static int wl1251_fetch_nvs(struct wl1251 *wl) } wl->nvs_len = fw->size; - wl->nvs = kmalloc(wl->nvs_len, GFP_KERNEL); + wl->nvs = kmemdup(fw->data, wl->nvs_len, GFP_KERNEL); if (!wl->nvs) { wl1251_error("could not allocate memory for the nvs file"); @@ -132,8 +132,6 @@ static int wl1251_fetch_nvs(struct wl1251 *wl) goto out; } - memcpy(wl->nvs, fw->data, wl->nvs_len); - ret = 0; out: |