From 60a4992aae33052a0be69b54ff6286d22e7f403f Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 20 Dec 2013 14:21:16 +0000 Subject: 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 Signed-off-by: Lee Jones --- drivers/mfd/mfd-core.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers') 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, } } } - if (!pdev->dev.of_node) - pdev->dev.of_node = parent->of_node; if (cell->pdata_size) { ret = platform_device_add_data(pdev, -- cgit v1.2.3