Skip to contentSkip to conversation

power: kmemdup instead of kzalloc + memcpy

PATCH Applied Andrei Epure 2 participants 2 messages Mar 27, 2013 – Apr 17, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 power: kmemdup instead of kzalloc + memcpy

Patch found using coccinelle.

---
 drivers/power/charger-manager.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/power/charger-manager.c +1 -2
index 8acc3f8..fefc39f 100644
@@ -1485,13 +1485,12 @@ static int charger_manager_probe(struct platform_device *pdev)
 
 	/* Basic Values. Unspecified are Null or 0 */
 	cm->dev = &pdev->dev;
-	cm->desc = kzalloc(sizeof(struct charger_desc), GFP_KERNEL);
+	cm->desc = kmemdup(desc, sizeof(struct charger_desc), GFP_KERNEL);
 	if (!cm->desc) {
 		dev_err(&pdev->dev, "Cannot allocate memory.\n");
 		ret = -ENOMEM;
 		goto err_alloc_desc;
 	}
-	memcpy(cm->desc, desc, sizeof(struct charger_desc));
 	cm->last_temp_mC = INT_MIN; /* denotes "unmeasured, yet" */
 
 	/*
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 4 lines · Andrei Epure

Patch found using coccinelle.

---

Applied, thanks!

Quoted 24 lines
 drivers/power/charger-manager.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/power/charger-manager.c +1 -2
index 8acc3f8..fefc39f 100644
@@ -1485,13 +1485,12 @@ static int charger_manager_probe(struct platform_device *pdev)
 
 	/* Basic Values. Unspecified are Null or 0 */
 	cm->dev = &pdev->dev;
-	cm->desc = kzalloc(sizeof(struct charger_desc), GFP_KERNEL);
+	cm->desc = kmemdup(desc, sizeof(struct charger_desc), GFP_KERNEL);
 	if (!cm->desc) {
 		dev_err(&pdev->dev, "Cannot allocate memory.\n");
 		ret = -ENOMEM;
 		goto err_alloc_desc;
 	}
-	memcpy(cm->desc, desc, sizeof(struct charger_desc));
 	cm->last_temp_mC = INT_MIN; /* denotes "unmeasured, yet" */
 
 	/*
Signature · 1 line
1.7.9.5