Merge git://git.infradead.org/mtd-2.6

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

diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index 7dd76bc..1823a57 100644 (file)
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -70,7 +70,9 @@ static int mfd_add_device(struct device *parent, int id,
                        goto fail_res;
        }
 
-       platform_device_add_resources(pdev, res, cell->num_resources);
+       ret = platform_device_add_resources(pdev, res, cell->num_resources);
+       if (ret)
+               goto fail_res;
 
        ret = platform_device_add(pdev);
        if (ret)