Unverified Commit 434f8154 authored by Mark Brown's avatar Mark Brown
Browse files

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

Merge series from Johan Hovold <johan@kernel.org>:

The original wcd938x driver has a couple of OF node reference leaks
which have been reproduced in the two later added drivers.
parents 9b30ceba 3ef4d9ed

sound/soc/codecs/wcd937x.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

sound/soc/codecs/wcd938x.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

sound/soc/codecs/wcd939x.c

+1 −2
Original line number Diff line number Diff line
@@ -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;