Commit 929980ab authored by Axel Lin's avatar Axel Lin Committed by Samuel Ortiz

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: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarMike Rapoport <mike@compulab.co.il>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 09ff21e0
...@@ -273,13 +273,19 @@ static int __devinit tps6586x_add_subdevs(struct tps6586x *tps6586x, ...@@ -273,13 +273,19 @@ static int __devinit tps6586x_add_subdevs(struct tps6586x *tps6586x,
subdev = &pdata->subdevs[i]; subdev = &pdata->subdevs[i];
pdev = platform_device_alloc(subdev->name, subdev->id); pdev = platform_device_alloc(subdev->name, subdev->id);
if (!pdev) {
ret = -ENOMEM;
goto failed;
}
pdev->dev.parent = tps6586x->dev; pdev->dev.parent = tps6586x->dev;
pdev->dev.platform_data = subdev->platform_data; pdev->dev.platform_data = subdev->platform_data;
ret = platform_device_add(pdev); ret = platform_device_add(pdev);
if (ret) if (ret) {
platform_device_put(pdev);
goto failed; goto failed;
}
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment