diff options
author | Julia Lawall <julia@diku.dk> | 2010-05-15 17:22:55 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-06-02 16:13:12 -0400 |
commit | 27b81bbed881ae93e8c23c216129cdeee86d4051 (patch) | |
tree | bbd0a665ded1d9e457e805dede8dc02adb57aa8a /drivers | |
parent | d3e5033d5f8609fd6cc19ee28d8f103885eb6596 (diff) |
drivers/net/wireless/p54: 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>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/p54/eeprom.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/p54/p54usb.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/p54/eeprom.c b/drivers/net/wireless/p54/eeprom.c index 187e263b045a..e51650ed49f2 100644 --- a/drivers/net/wireless/p54/eeprom.c +++ b/drivers/net/wireless/p54/eeprom.c | |||
@@ -599,13 +599,13 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len) | |||
599 | } | 599 | } |
600 | break; | 600 | break; |
601 | case PDR_PRISM_ZIF_TX_IQ_CALIBRATION: | 601 | case PDR_PRISM_ZIF_TX_IQ_CALIBRATION: |
602 | priv->iq_autocal = kmalloc(data_len, GFP_KERNEL); | 602 | priv->iq_autocal = kmemdup(entry->data, data_len, |
603 | GFP_KERNEL); | ||
603 | if (!priv->iq_autocal) { | 604 | if (!priv->iq_autocal) { |
604 | err = -ENOMEM; | 605 | err = -ENOMEM; |
605 | goto err; | 606 | goto err; |
606 | } | 607 | } |
607 | 608 | ||
608 | memcpy(priv->iq_autocal, entry->data, data_len); | ||
609 | priv->iq_autocal_len = data_len / sizeof(struct pda_iq_autocal_entry); | 609 | priv->iq_autocal_len = data_len / sizeof(struct pda_iq_autocal_entry); |
610 | break; | 610 | break; |
611 | case PDR_DEFAULT_COUNTRY: | 611 | case PDR_DEFAULT_COUNTRY: |
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c index d5b197b4d5bb..a06862130703 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c | |||
@@ -433,10 +433,9 @@ static int p54u_firmware_reset_3887(struct ieee80211_hw *dev) | |||
433 | u8 *buf; | 433 | u8 *buf; |
434 | int ret; | 434 | int ret; |
435 | 435 | ||
436 | buf = kmalloc(4, GFP_KERNEL); | 436 | buf = kmemdup(p54u_romboot_3887, 4, GFP_KERNEL); |
437 | if (!buf) | 437 | if (!buf) |
438 | return -ENOMEM; | 438 | return -ENOMEM; |
439 | memcpy(buf, p54u_romboot_3887, 4); | ||
440 | ret = p54u_bulk_msg(priv, P54U_PIPE_DATA, | 439 | ret = p54u_bulk_msg(priv, P54U_PIPE_DATA, |
441 | buf, 4); | 440 | buf, 4); |
442 | kfree(buf); | 441 | kfree(buf); |