aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2017-11-11 12:05:32 -0500
committerKalle Valo <kvalo@qca.qualcomm.com>2017-11-20 11:20:41 -0500
commit1967c12896e09599e77cd62f660a99bef4e3ab19 (patch)
tree20746e4b8774ed8e852c730848ec7578cccc76bf
parent307aeb31af0d9ba63346466f88badd64e7ed9786 (diff)
wcn36xx: fix iris child-node lookup
Fix child-node lookup during probe, which ended up searching the whole device tree depth-first starting at the parent rather than just matching on its children. To make things worse, the parent mmio node was also prematurely freed. Fixes: fd52bdae9ab0 ("wcn36xx: Disable 5GHz for wcn3620") Cc: Loic Poulain <loic.poulain@linaro.org> Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
-rw-r--r--drivers/net/wireless/ath/wcn36xx/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
index 71812a2dd513..f7d228b5ba93 100644
--- a/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/drivers/net/wireless/ath/wcn36xx/main.c
@@ -1233,7 +1233,7 @@ static int wcn36xx_platform_get_resources(struct wcn36xx *wcn,
1233 } 1233 }
1234 1234
1235 /* External RF module */ 1235 /* External RF module */
1236 iris_node = of_find_node_by_name(mmio_node, "iris"); 1236 iris_node = of_get_child_by_name(mmio_node, "iris");
1237 if (iris_node) { 1237 if (iris_node) {
1238 if (of_device_is_compatible(iris_node, "qcom,wcn3620")) 1238 if (of_device_is_compatible(iris_node, "qcom,wcn3620"))
1239 wcn->rf_id = RF_IRIS_WCN3620; 1239 wcn->rf_id = RF_IRIS_WCN3620;