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: stable stable@vger.kernel.org # 4.14 Cc: Loic Poulain loic.poulain@linaro.org Signed-off-by: Johan Hovold johan@kernel.org --- drivers/net/wireless/ath/wcn36xx/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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, }
/* External RF module */ - iris_node = of_find_node_by_name(mmio_node, "iris"); + iris_node = of_get_child_by_name(mmio_node, "iris"); if (iris_node) { if (of_device_is_compatible(iris_node, "qcom,wcn3620")) wcn->rf_id = RF_IRIS_WCN3620;
Johan Hovold johan@kernel.org writes:
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")
fd52bdae9ab0 is in net-next right now so the first release for that commit should be v4.15-rc1.
Cc: stable stable@vger.kernel.org # 4.14
As fd52bdae9ab0 is not in v4.14 no need to Cc stable. I'll remove it.
Cc: Loic Poulain loic.poulain@linaro.org Signed-off-by: Johan Hovold johan@kernel.org
Thanks, I'll queue this to v4.15.
On Mon, Nov 13, 2017 at 08:51:49AM +0000, Kalle Valo wrote:
Johan Hovold johan@kernel.org writes:
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")
fd52bdae9ab0 is in net-next right now so the first release for that commit should be v4.15-rc1.
Cc: stable stable@vger.kernel.org # 4.14
As fd52bdae9ab0 is not in v4.14 no need to Cc stable. I'll remove it.
Ah, sorry. Thanks for fixing that up.
Cc: Loic Poulain loic.poulain@linaro.org Signed-off-by: Johan Hovold johan@kernel.org
Thanks, I'll queue this to v4.15.
Johan
Johan Hovold johan@kernel.org wrote:
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
Patch applied to ath-current branch of ath.git, thanks.
1967c12896e0 wcn36xx: fix iris child-node lookup
linux-stable-mirror@lists.linaro.org
-
Johan Hovold -
Kalle Valo