summaryrefslogtreecommitdiff
path: root/drivers/bus
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@nxp.com>2016-02-22 15:01:53 +0300
committerSasha Levin <sasha.levin@oracle.com>2016-04-18 15:49:29 +0300
commit9de250999c5c3ef93aced491db8d9560220768f9 (patch)
treed7cb2ba0f5a173e2ed4254fde88167ebe310f2ec /drivers/bus
parenta4e6ab6425bda36516505a15afa96f76ffa64cb7 (diff)
downloadlinux-9de250999c5c3ef93aced491db8d9560220768f9.tar.xz
bus: imx-weim: Take the 'status' property value into account
[ Upstream commit 33b96d2c9579213cf3f36d7b29841b1e464750c4 ] Currently we have an incorrect behaviour when multiple devices are present under the weim node. For example: &weim { ... status = "okay"; sram@0,0 { ... status = "okay"; }; mram@0,0 { ... status = "disabled"; }; }; In this case only the 'sram' device should be probed and not 'mram'. However what happens currently is that the status variable is ignored, causing the 'sram' device to be disabled and 'mram' to be enabled. Change the weim_parse_dt() function to use for_each_available_child_of_node()so that the devices marked with 'status = disabled' are not probed. Cc: <stable@vger.kernel.org> Suggested-by: Wolfgang Netbal <wolfgang.netbal@sigmatek.at> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/bus')
-rw-r--r--drivers/bus/imx-weim.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c
index 75c9681f8021..0ff86b980d05 100644
--- a/drivers/bus/imx-weim.c
+++ b/drivers/bus/imx-weim.c
@@ -150,7 +150,7 @@ static int __init weim_parse_dt(struct platform_device *pdev,
return ret;
}
- for_each_child_of_node(pdev->dev.of_node, child) {
+ for_each_available_child_of_node(pdev->dev.of_node, child) {
if (!child->name)
continue;