mfd: pcf50633: Check return value of platform_device_add()

[pandora-kernel.git] / drivers / mfd / pcf50633-core.c

diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c
index 41ab5e3..e15c060 100644 (file)
--- a/drivers/mfd/pcf50633-core.c
+++ b/drivers/mfd/pcf50633-core.c
@@ -195,8 +195,9 @@ static int pcf50633_probe(struct i2c_client *client,
                                const struct i2c_device_id *ids)
 {
        struct pcf50633 *pcf;
+       struct platform_device *pdev;
        struct pcf50633_platform_data *pdata = dev_get_platdata(&client->dev);
-       int i, ret;
+       int i, j, ret;
        int version, variant;
 
        if (!client->irq) {
@@ -243,35 +244,38 @@ static int pcf50633_probe(struct i2c_client *client,
 
 
        for (i = 0; i < PCF50633_NUM_REGULATORS; i++) {
-               struct platform_device *pdev;
-
                pdev = platform_device_alloc("pcf50633-regulator", i);
-               if (!pdev) {
-                       dev_err(pcf->dev, "Cannot create regulator %d\n", i);
-                       continue;
-               }
+               if (!pdev)
+                       return -ENOMEM;
 
                pdev->dev.parent = pcf->dev;
-               if (platform_device_add_data(pdev, &pdata->reg_init_data[i],
-                                       sizeof(pdata->reg_init_data[i])) < 0) {
-                       platform_device_put(pdev);
-                       dev_err(pcf->dev, "Out of memory for regulator parameters %d\n",
-                                                                       i);
-                       continue;
-               }
-               pcf->regulator_pdev[i] = pdev;
+               ret = platform_device_add_data(pdev, &pdata->reg_init_data[i],
+                                              sizeof(pdata->reg_init_data[i]));
+               if (ret)
+                       goto err;
+
+               ret = platform_device_add(pdev);
+               if (ret)
+                       goto err;
 
-               platform_device_add(pdev);
+               pcf->regulator_pdev[i] = pdev;
        }
 
        ret = sysfs_create_group(&client->dev.kobj, &pcf_attr_group);
        if (ret)
-               dev_err(pcf->dev, "error creating sysfs entries\n");
+               dev_warn(pcf->dev, "error creating sysfs entries\n");
 
        if (pdata->probe_done)
                pdata->probe_done(pcf);
 
        return 0;
+
+err:
+       platform_device_put(pdev);
+       for (j = 0; j < i; j++)
+               platform_device_put(pcf->regulator_pdev[j]);
+
+       return ret;
 }
 
 static int pcf50633_remove(struct i2c_client *client)