]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
mfd: Revert "mfd: Always assign of_node in mfd_add_device()"
authorLee Jones <lee.jones@linaro.org>
Fri, 20 Dec 2013 14:21:16 +0000 (14:21 +0000)
committerLee Jones <lee.jones@linaro.org>
Tue, 21 Jan 2014 08:28:14 +0000 (08:28 +0000)
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>
drivers/mfd/mfd-core.c

index 32e8d47d900284574aefaf9909643c3c372afc94..2676492447378e989b019d05e223b622afb2c79c 100644 (file)
@@ -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,