Skip to content

Commit

Permalink
mfd: Fix da903x_add_subdevs error path
Browse files Browse the repository at this point in the history
This patch fixes da903x_add_subdevs error path:
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: Eric Miao <eric.y.miao@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 2c36af7 commit b59cede
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion drivers/mfd/da903x.c
Original file line number Diff line number Diff line change
Expand Up @@ -470,13 +470,19 @@ static int __devinit da903x_add_subdevs(struct da903x_chip *chip,
subdev = &pdata->subdevs[i];

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

pdev->dev.parent = chip->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 b59cede

Please sign in to comment.