diff options
| author | Axel Lin <axel.lin@gmail.com> | 2010-08-24 13:44:05 +0800 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-10-29 00:28:56 +0200 |
| commit | b59cedeffaef54dd091baf01fd5e276ac50a3176 (patch) | |
| tree | cb0d09792f756bc6297daaf91aae75d493358adb /drivers/mfd/da903x.c | |
| parent | 2c36af7b57540ea52d74dbbe71bf860aca910bb9 (diff) | |
| download | linux-stable-b59cedeffaef54dd091baf01fd5e276ac50a3176.tar.gz linux-stable-b59cedeffaef54dd091baf01fd5e276ac50a3176.tar.bz2 linux-stable-b59cedeffaef54dd091baf01fd5e276ac50a3176.zip | |
mfd: Fix da903x_add_subdevs error path
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>
Diffstat (limited to 'drivers/mfd/da903x.c')
| -rw-r--r-- | drivers/mfd/da903x.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c index c07aece900fb..2fadbaeb1cb1 100644 --- a/drivers/mfd/da903x.c +++ b/drivers/mfd/da903x.c @@ -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; |