diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2011-04-06 10:52:52 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-05-26 13:44:56 -0400 |
commit | eb8956074e7652e802be5f078080c704c2c87104 (patch) | |
tree | b96a4eaaf69e36a6a88282fa9572e194c5f5a1ba /drivers/mfd/mfd-core.c | |
parent | 4db70f73e56961b9bcdfd0c36c62847a18b7dbb5 (diff) |
mfd: Add platform data pointer back
Now that we have a way to pass MFD cells down to the sub drivers,
we can gradually get rid of mfd_data by putting the platform pointer
back in place.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/mfd-core.c')
-rw-r--r-- | drivers/mfd/mfd-core.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c index f4c8c844b913..0902523af62d 100644 --- a/drivers/mfd/mfd-core.c +++ b/drivers/mfd/mfd-core.c | |||
@@ -88,6 +88,13 @@ static int mfd_add_device(struct device *parent, int id, | |||
88 | 88 | ||
89 | pdev->dev.parent = parent; | 89 | pdev->dev.parent = parent; |
90 | 90 | ||
91 | if (cell->pdata_size) { | ||
92 | ret = platform_device_add_data(pdev, | ||
93 | cell->platform_data, cell->pdata_size); | ||
94 | if (ret) | ||
95 | goto fail_res; | ||
96 | } | ||
97 | |||
91 | ret = mfd_platform_add_cell(pdev, cell); | 98 | ret = mfd_platform_add_cell(pdev, cell); |
92 | if (ret) | 99 | if (ret) |
93 | goto fail_res; | 100 | goto fail_res; |