diff options
| author | Lee Jones <lee.jones@linaro.org> | 2013-12-20 09:21:16 -0500 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2014-01-21 03:28:14 -0500 |
| commit | 60a4992aae33052a0be69b54ff6286d22e7f403f (patch) | |
| tree | 9ead6cc99a5b146c31b81369ae1d6c362aa82204 | |
| parent | b5167bc466ef5a267cbd2c1acc4bfb8959d26f47 (diff) | |
mfd: Revert "mfd: Always assign of_node in mfd_add_device()"
This reverts commit 68044bee13770918e0b28dd44aa98c889ec7558f.
We've had confirmed reports of this patch causing unforeseen issues
with existing MFD users. It has been agreed by the original author
and myself that reversion is the best solution.
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
| -rw-r--r-- | drivers/mfd/mfd-core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c index 32e8d47d9002..267649244737 100644 --- a/drivers/mfd/mfd-core.c +++ b/drivers/mfd/mfd-core.c | |||
| @@ -117,8 +117,6 @@ static int mfd_add_device(struct device *parent, int id, | |||
| 117 | } | 117 | } |
| 118 | } | 118 | } |
| 119 | } | 119 | } |
| 120 | if (!pdev->dev.of_node) | ||
| 121 | pdev->dev.of_node = parent->of_node; | ||
| 122 | 120 | ||
| 123 | if (cell->pdata_size) { | 121 | if (cell->pdata_size) { |
| 124 | ret = platform_device_add_data(pdev, | 122 | ret = platform_device_add_data(pdev, |