ASoC: codecs: wcd93xx: fix OF node leaks on probe

broonie · broonie · commit 434f8154bf47 · 2025-12-04T11:38:34.000Z
Merge series from Johan Hovold &lt;johan@kernel.org&gt;:

The original wcd938x driver has a couple of OF node reference leaks
which have been reproduced in the two later added drivers.
diff --git a/sound/soc/codecs/wcd937x.c b/sound/soc/codecs/wcd937x.c
@@ -2841,7 +2841,7 @@ static int wcd937x_add_slave_components(struct wcd937x_priv *wcd937x,
 		dev_err(dev, "Couldn't parse phandle to qcom,rx-device!\n");
 		return -ENODEV;
 	}
-	of_node_get(wcd937x->rxnode);
+
 	component_match_add_release(dev, matchptr, component_release_of,
 				    component_compare_of, wcd937x->rxnode);
 
@@ -2850,7 +2850,7 @@ static int wcd937x_add_slave_components(struct wcd937x_priv *wcd937x,
 		dev_err(dev, "Couldn't parse phandle to qcom,tx-device\n");
 			return -ENODEV;
 	}
-	of_node_get(wcd937x->txnode);
+
 	component_match_add_release(dev, matchptr, component_release_of,
 				    component_compare_of, wcd937x->txnode);
 
diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c
@@ -3464,7 +3464,6 @@ static int wcd938x_add_slave_components(struct wcd938x_priv *wcd938x,
 		return -ENODEV;
 	}
 
-	of_node_get(wcd938x->rxnode);
 	component_match_add_release(dev, matchptr, component_release_of,
 				    component_compare_of, wcd938x->rxnode);
 
@@ -3473,7 +3472,7 @@ static int wcd938x_add_slave_components(struct wcd938x_priv *wcd938x,
 		dev_err(dev, "%s: Tx-device node not defined\n", __func__);
 		return -ENODEV;
 	}
-	of_node_get(wcd938x->txnode);
+
 	component_match_add_release(dev, matchptr, component_release_of,
 				    component_compare_of, wcd938x->txnode);
 	return 0;
diff --git a/sound/soc/codecs/wcd939x.c b/sound/soc/codecs/wcd939x.c
@@ -3526,7 +3526,6 @@ static int wcd939x_add_slave_components(struct wcd939x_priv *wcd939x,
 		return -ENODEV;
 	}
 
-	of_node_get(wcd939x->rxnode);
 	component_match_add_release(dev, matchptr, component_release_of,
 				    component_compare_of, wcd939x->rxnode);
 
@@ -3535,7 +3534,7 @@ static int wcd939x_add_slave_components(struct wcd939x_priv *wcd939x,
 		dev_err(dev, "%s: Tx-device node not defined\n", __func__);
 		return -ENODEV;
 	}
-	of_node_get(wcd939x->txnode);
+
 	component_match_add_release(dev, matchptr, component_release_of,
 				    component_compare_of, wcd939x->txnode);
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -3464,7 +3464,6 @@ static int wcd938x_add_slave_components(struct wcd938x_priv *wcd938x,`
`3464`	`3464`	`return -ENODEV;`
`3465`	`3465`	`}`
`3466`	`3466`
`3467`		`- of_node_get(wcd938x->rxnode);`
`3468`	`3467`	`component_match_add_release(dev, matchptr, component_release_of,`
`3469`	`3468`	`component_compare_of, wcd938x->rxnode);`
`3470`	`3469`
`@@ -3473,7 +3472,7 @@ static int wcd938x_add_slave_components(struct wcd938x_priv *wcd938x,`
`3473`	`3472`	`dev_err(dev, "%s: Tx-device node not defined\n", __func__);`
`3474`	`3473`	`return -ENODEV;`
`3475`	`3474`	`}`
`3476`		`- of_node_get(wcd938x->txnode);`
	`3475`	`+`
`3477`	`3476`	`component_match_add_release(dev, matchptr, component_release_of,`
`3478`	`3477`	`component_compare_of, wcd938x->txnode);`
`3479`	`3478`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -3526,7 +3526,6 @@ static int wcd939x_add_slave_components(struct wcd939x_priv *wcd939x,`
`3526`	`3526`	`return -ENODEV;`
`3527`	`3527`	`}`
`3528`	`3528`
`3529`		`- of_node_get(wcd939x->rxnode);`
`3530`	`3529`	`component_match_add_release(dev, matchptr, component_release_of,`
`3531`	`3530`	`component_compare_of, wcd939x->rxnode);`
`3532`	`3531`
`@@ -3535,7 +3534,7 @@ static int wcd939x_add_slave_components(struct wcd939x_priv *wcd939x,`
`3535`	`3534`	`dev_err(dev, "%s: Tx-device node not defined\n", __func__);`
`3536`	`3535`	`return -ENODEV;`
`3537`	`3536`	`}`
`3538`		`- of_node_get(wcd939x->txnode);`
	`3537`	`+`
`3539`	`3538`	`component_match_add_release(dev, matchptr, component_release_of,`
`3540`	`3539`	`component_compare_of, wcd939x->txnode);`
`3541`	`3540`	`return 0;`