From 2367972d889f1b1dad41cf5ff5823ff2c1589838 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 29 Dec 2011 13:56:02 -0200 Subject: [PATCH] --- yaml --- r: 282199 b: refs/heads/master c: cbe10a3674ba1cfa227d0d4e990353bada85fa09 h: refs/heads/master i: 282197: 7b2cd3e0227e32797f77244106648c017126a846 282195: a9645617afe0580eb41af1616cb43b155faf6339 282191: 1ad1587750298dac2e4ec177c0f16d021441e8eb v: v3 --- [refs] | 2 +- trunk/drivers/regulator/mc13783-regulator.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cbcaf62f7cc8..276d52bac321 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32c78de8f17369def492ea3ddd785f0cc140af02 +refs/heads/master: cbe10a3674ba1cfa227d0d4e990353bada85fa09 diff --git a/trunk/drivers/regulator/mc13783-regulator.c b/trunk/drivers/regulator/mc13783-regulator.c index 56d4a677c404..8e9b90ad88ae 100644 --- a/trunk/drivers/regulator/mc13783-regulator.c +++ b/trunk/drivers/regulator/mc13783-regulator.c @@ -344,7 +344,7 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev) dev_dbg(&pdev->dev, "%s id %d\n", __func__, pdev->id); - priv = kzalloc(sizeof(*priv) + + priv = devm_kzalloc(&pdev->dev, sizeof(*priv) + pdata->num_regulators * sizeof(priv->regulators[0]), GFP_KERNEL); if (!priv) @@ -374,8 +374,6 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev) while (--i >= 0) regulator_unregister(priv->regulators[i]); - kfree(priv); - return ret; } @@ -391,7 +389,6 @@ static int __devexit mc13783_regulator_remove(struct platform_device *pdev) for (i = 0; i < pdata->num_regulators; i++) regulator_unregister(priv->regulators[i]); - kfree(priv); return 0; }