[PATCH] 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: stable # 4.14
Cc: Loic Poulain
Signed-off-by: Johan Hovold
---
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;
--
2.15.0
Re: [PATCH] wcn36xx: fix iris child-node lookup
Johan Hovold 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 # 4.14
As fd52bdae9ab0 is not in v4.14 no need to Cc stable. I'll remove it.
> Cc: Loic Poulain
> Signed-off-by: Johan Hovold
Thanks, I'll queue this to v4.15.
--
Kalle Valo
Re: [PATCH] wcn36xx: fix iris child-node lookup
On Mon, Nov 13, 2017 at 08:51:49AM +, Kalle Valo wrote:
> Johan Hovold 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 # 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
> > Signed-off-by: Johan Hovold
>
> Thanks, I'll queue this to v4.15.
Johan
