diff options
| author | Axel Lin <axel.lin@gmail.com> | 2010-08-24 13:47:22 +0800 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-10-29 00:28:59 +0200 |
| commit | 929980ab1b90b5a5c93db9b9b7d58cc6e93049c8 (patch) | |
| tree | 99eeed3baf78f5ec197efa124ab0df82a4ae70d6 /drivers/mfd | |
| parent | 09ff21e0f670a71ea43765cedaab9246fd81540e (diff) | |
| download | lwn-929980ab1b90b5a5c93db9b9b7d58cc6e93049c8.tar.gz lwn-929980ab1b90b5a5c93db9b9b7d58cc6e93049c8.zip | |
mfd: Fix tps6586x_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: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/tps6586x.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c index bc6587194de9..2f9336c3710c 100644 --- a/drivers/mfd/tps6586x.c +++ b/drivers/mfd/tps6586x.c @@ -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; |