From 808c71a3a1a61c3891f1349ae9ef0c30f27bdf74 Mon Sep 17 00:00:00 2001 From: Andrei Epure Date: Wed, 27 Mar 2013 23:48:21 +0200 Subject: [PATCH] --- yaml --- r: 367535 b: refs/heads/master c: f2c6a5fb258bdfa5aa9743b912b6b782fa631959 h: refs/heads/master i: 367533: 352fe2e89953a00aae91db946203a30fe51b99e8 367531: 9a0c40e515f4ff118a14a3bb9f50beecc144ba88 367527: 75c46f701eeece36b5981734a507302119f1f6f1 367519: 09e87167d3521c22878b98e645ebf0b6156308a8 v: v3 --- [refs] | 2 +- trunk/drivers/power/charger-manager.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 833bedf9ca82..0de30536cfaa 100644 --- 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 index 8acc3f8d303c..fefc39fe42be 100644 --- 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" */ /*