---

yaml --- r: 367535 b: refs/heads/master c: f2c6a5f h: refs/heads/master i: 367533: 352fe2e 367531: 9a0c40e 367527: 75c46f7 367519: 09e8716 v: v3
git-mirror · Apr 17, 2013 · 808c71a · 808c71a
1 parent 2bb6535
commit 808c71a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6e0b081fb300a4601b064346963cf6bb163f437
+refs/heads/master: f2c6a5fb258bdfa5aa9743b912b6b782fa631959
diff --git a/trunk/drivers/power/charger-manager.c b/trunk/drivers/power/charger-manager.c
@@ -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" */
 
 	/*