Skip to content

Commit

Permalink
mfd: Fix tps6586x_add_subdevs error path
Browse files Browse the repository at this point in the history
1. return -ENOMEM if platform_device_alloc() fail.
2. call platform_device_put() if platform_device_add() fail.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Axel Lin authored and Samuel Ortiz committed Oct 28, 2010
1 parent 09ff21e commit 929980a
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion drivers/mfd/tps6586x.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,13 +273,19 @@ static int __devinit tps6586x_add_subdevs(struct tps6586x *tps6586x,
subdev = &pdata->subdevs[i];

pdev = platform_device_alloc(subdev->name, subdev->id);
if (!pdev) {
ret = -ENOMEM;
goto failed;
}

pdev->dev.parent = tps6586x->dev;
pdev->dev.platform_data = subdev->platform_data;

ret = platform_device_add(pdev);
if (ret)
if (ret) {
platform_device_put(pdev);
goto failed;
}
}
return 0;

Expand Down

0 comments on commit 929980a

Please sign in to comment.