From patchwork Sat May 15 21:15:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 99875 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4FLGVKf015085 for ; Sat, 15 May 2010 21:16:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754693Ab0EOVPT (ORCPT ); Sat, 15 May 2010 17:15:19 -0400 Received: from mgw1.diku.dk ([130.225.96.91]:46624 "EHLO mgw1.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754024Ab0EOVPQ (ORCPT ); Sat, 15 May 2010 17:15:16 -0400 Received: from localhost (localhost [127.0.0.1]) by mgw1.diku.dk (Postfix) with ESMTP id 05A4A52C3EB; Sat, 15 May 2010 23:15:16 +0200 (CEST) Received: from mgw1.diku.dk ([127.0.0.1]) by localhost (mgw1.diku.dk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id btcrehR8HVkz; Sat, 15 May 2010 23:15:10 +0200 (CEST) Received: from nhugin.diku.dk (nhugin.diku.dk [130.225.96.140]) by mgw1.diku.dk (Postfix) with ESMTP id A4A7A52C3A4; Sat, 15 May 2010 23:15:10 +0200 (CEST) Received: from ask.diku.dk (ask.diku.dk [130.225.96.225]) by nhugin.diku.dk (Postfix) with ESMTP id 292396DFD05; Sat, 15 May 2010 23:07:59 +0200 (CEST) Received: by ask.diku.dk (Postfix, from userid 3767) id 8723E200BE; Sat, 15 May 2010 23:15:10 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by ask.diku.dk (Postfix) with ESMTP id 7F31E200BC; Sat, 15 May 2010 23:15:10 +0200 (CEST) Date: Sat, 15 May 2010 23:15:10 +0200 (CEST) From: Julia Lawall To: Kalle Valo , "John W. Linville" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 7/37] drivers/net/wireless/wl12xx: Use kmemdup Message-ID: MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 15 May 2010 21:16:31 +0000 (UTC) diff -u -p a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c --- 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 wl125 } 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 wl125 goto out; } - memcpy(wl->nvs, fw->data, wl->nvs_len); - ret = 0; out: