aboutsummaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorAndrei Epure <epure.andrei@gmail.com>2013-03-27 23:48:21 +0200
committerAnton Vorontsov <anton@enomsg.org>2013-04-16 18:56:38 -0700
commitf2c6a5fb258bdfa5aa9743b912b6b782fa631959 (patch)
treeb32a4956b709c99b97d932c20e9e086ed7bce428 /drivers/power
parentf6e0b081fb300a4601b064346963cf6bb163f437 (diff)
downloadlinux-linaro-stable-f2c6a5fb258bdfa5aa9743b912b6b782fa631959.tar.gz
charger-manager: Use kmemdup instead of kzalloc + memcpy
Patch found using coccinelle. Signed-off-by: Andrei Epure <epure.andrei@gmail.com> Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/charger-manager.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index 8acc3f8d303c..fefc39fe42be 100644
--- a/drivers/power/charger-manager.c
+++ b/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" */
/*