Skip to contentSkip to conversation

wcn36xx: fix iris child-node lookup

PATCH In review Johan Hovold 2 participants 4 messages Nov 11, 2017 – Nov 20, 2017

Subsystems (4)
Networking Network drivers Stable branch Qualcomm WCN36XX wireless driver
lore
Share & tools
lore

Johan Hovold

author
#0 lore raw

PATCH 1/1 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 <[email protected]> # 4.14
Cc Loic Poulain <[email protected]>
Signed-off-by Johan Hovold <[email protected]>
---
 drivers/net/wireless/ath/wcn36xx/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/wcn36xx/main.c +1 -1
index 71812a2dd513..f7d228b5ba93 100644
@@ -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;
Signature · 1 line
2.15.0
#1 lore raw
Quoted 7 lines · Johan Hovold

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.

Quoted 1 line
Cc stable <[email protected]> # 4.14

As fd52bdae9ab0 is not in v4.14 no need to Cc stable. I'll remove it.

Quoted 2 lines
Cc Loic Poulain <[email protected]>
Signed-off-by Johan Hovold <[email protected]>

Thanks, I'll queue this to v4.15.

Signature · 1 line
Kalle Valo
author
#2 lore raw
Quoted 8 lines · Kalle Valo
Quoted 6 lines · Johan Hovold

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.

Quoted 8 lines
Quoted 1 line
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.

Quoted 1 line
Cc stable <[email protected]> # 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.

Quoted 4 lines
Quoted 2 lines
Cc Loic Poulain <[email protected]>
Signed-off-by Johan Hovold <[email protected]>

Thanks, I'll queue this to v4.15.

Johan

#3 lore raw
In reply to Johan Hovold
Quoted 10 lines · Johan Hovold

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 <[email protected]>
Signed-off-by Johan Hovold <[email protected]>
Signed-off-by Kalle Valo <[email protected]>

Patch applied to ath-current branch of ath.git, thanks.

1967c12896e0 wcn36xx: fix iris child-node lookup

Signature · 3 lines
https://patchwork.kernel.org/patch/10054441/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches