summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-12-20 14:21:16 +0000
committerLee Jones <lee.jones@linaro.org>2014-01-21 08:28:14 +0000
commit60a4992aae33052a0be69b54ff6286d22e7f403f (patch)
tree9ead6cc99a5b146c31b81369ae1d6c362aa82204
parentb5167bc466ef5a267cbd2c1acc4bfb8959d26f47 (diff)
downloadop-kernel-dev-60a4992aae33052a0be69b54ff6286d22e7f403f.zip
op-kernel-dev-60a4992aae33052a0be69b54ff6286d22e7f403f.tar.gz
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.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index 32e8d47..2676492 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,
}
}
}
- if (!pdev->dev.of_node)
- pdev->dev.of_node = parent->of_node;
if (cell->pdata_size) {
ret = platform_device_add_data(pdev,
OpenPOWER on IntegriCloud