Skip to content

Commit

Permalink
regulator: handle kcalloc() failure
Browse files Browse the repository at this point in the history
Return -ENOMEM if kcalloc() fails

Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  • Loading branch information
Dan Carpenter authored and Liam Girdwood committed Mar 22, 2010
1 parent 3fff6c0 commit 67e46f3
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions drivers/regulator/lp3971.c
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,10 @@ static int __devinit setup_regulators(struct lp3971 *lp3971,
lp3971->num_regulators = pdata->num_regulators;
lp3971->rdev = kcalloc(pdata->num_regulators,
sizeof(struct regulator_dev *), GFP_KERNEL);
if (!lp3971->rdev) {
err = -ENOMEM;
goto err_nomem;
}

/* Instantiate the regulators */
for (i = 0; i < pdata->num_regulators; i++) {
Expand All @@ -461,6 +465,7 @@ static int __devinit setup_regulators(struct lp3971 *lp3971,
regulator_unregister(lp3971->rdev[i]);
kfree(lp3971->rdev);
lp3971->rdev = NULL;
err_nomem:
return err;
}

Expand Down

0 comments on commit 67e46f3

Please sign in to comment.