Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

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;