Browse Source

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>
Julia Lawall 15 years ago
parent
commit
80caf6017a
1 changed files with 1 additions and 3 deletions
  1. 1 3
      drivers/net/wireless/wl12xx/wl1251_main.c

+ 1 - 3
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_len = fw->size;
-	wl->nvs = kmalloc(wl->nvs_len, GFP_KERNEL);
+	wl->nvs = kmemdup(fw->data, wl->nvs_len, GFP_KERNEL);
 
 
 	if (!wl->nvs) {
 	if (!wl->nvs) {
 		wl1251_error("could not allocate memory for the nvs file");
 		wl1251_error("could not allocate memory for the nvs file");
@@ -132,8 +132,6 @@ static int wl1251_fetch_nvs(struct wl1251 *wl)
 		goto out;
 		goto out;
 	}
 	}
 
 
-	memcpy(wl->nvs, fw->data, wl->nvs_len);
-
 	ret = 0;
 	ret = 0;
 
 
 out:
 out: