drm: merge Linux master into HEAD

[linux-2.6-omap-h63xx.git] / drivers / mfd / mfd-core.c

diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index 6c0d1bec4b76c1ab58ae0cbe86cc2539cc3b6375..54ddf3772e0c104c29e9d98da29e22eb7c300220 100644 (file)
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -34,6 +34,7 @@ static int mfd_add_device(struct device *parent, int id,
                goto fail_device;
 
        pdev->dev.parent = parent;
+       platform_set_drvdata(pdev, cell->driver_data);
 
        ret = platform_device_add_data(pdev,
                        cell->platform_data, cell->data_size);