Unverified Commit da29b94e authored by Johan Hovold's avatar Johan Hovold Committed by Mark Brown
Browse files

ASoC: codecs: wcd938x: fix resource leaks on bind errors 



Add the missing code to release resources on bind errors, including the
references taken by wcd938x_sdw_device_get() which also need to be
dropped on unbind().

Fixes: 16572522 ("ASoC: codecs: wcd938x-sdw: add SoundWire driver")
Cc: stable@vger.kernel.org      # 5.14
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20231003155558.27079-4-johan+linaro@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fa2f8a99

sound/soc/codecs/wcd938x.c

+34 −10
Original line number Diff line number Diff line
@@ -3435,7 +3435,8 @@ static int wcd938x_bind(struct device *dev) 
	wcd938x->rxdev = wcd938x_sdw_device_get(wcd938x->rxnode);

	if (!wcd938x->rxdev) {

		dev_err(dev, "could not find slave with matching of node\n");

		return -EINVAL;

		ret = -EINVAL;

		goto err_unbind;

	}

	wcd938x->sdw_priv[AIF1_PB] = dev_get_drvdata(wcd938x->rxdev);

	wcd938x->sdw_priv[AIF1_PB]->wcd938x = wcd938x;
@@ -3443,7 +3444,8 @@ static int wcd938x_bind(struct device *dev) 
	wcd938x->txdev = wcd938x_sdw_device_get(wcd938x->txnode);

	if (!wcd938x->txdev) {

		dev_err(dev, "could not find txslave with matching of node\n");

		return -EINVAL;

		ret = -EINVAL;

		goto err_put_rxdev;

	}

	wcd938x->sdw_priv[AIF1_CAP] = dev_get_drvdata(wcd938x->txdev);

	wcd938x->sdw_priv[AIF1_CAP]->wcd938x = wcd938x;
@@ -3454,31 +3456,35 @@ static int wcd938x_bind(struct device *dev) 
	if (!device_link_add(wcd938x->rxdev, wcd938x->txdev, DL_FLAG_STATELESS |

			    DL_FLAG_PM_RUNTIME)) {

		dev_err(dev, "could not devlink tx and rx\n");

		return -EINVAL;

		ret = -EINVAL;

		goto err_put_txdev;

	}



	if (!device_link_add(dev, wcd938x->txdev, DL_FLAG_STATELESS |

					DL_FLAG_PM_RUNTIME)) {

		dev_err(dev, "could not devlink wcd and tx\n");

		return -EINVAL;

		ret = -EINVAL;

		goto err_remove_rxtx_link;

	}



	if (!device_link_add(dev, wcd938x->rxdev, DL_FLAG_STATELESS |

					DL_FLAG_PM_RUNTIME)) {

		dev_err(dev, "could not devlink wcd and rx\n");

		return -EINVAL;

		ret = -EINVAL;

		goto err_remove_tx_link;

	}



	wcd938x->regmap = dev_get_regmap(&wcd938x->tx_sdw_dev->dev, NULL);

	if (!wcd938x->regmap) {

		dev_err(dev, "could not get TX device regmap\n");

		return -EINVAL;

		ret = -EINVAL;

		goto err_remove_rx_link;

	}



	ret = wcd938x_irq_init(wcd938x, dev);

	if (ret) {

		dev_err(dev, "%s: IRQ init failed: %d\n", __func__, ret);

		return ret;

		goto err_remove_rx_link;

	}



	wcd938x->sdw_priv[AIF1_PB]->slave_irq = wcd938x->virq;
@@ -3487,17 +3493,33 @@ static int wcd938x_bind(struct device *dev) 
	ret = wcd938x_set_micbias_data(wcd938x);

	if (ret < 0) {

		dev_err(dev, "%s: bad micbias pdata\n", __func__);

		return ret;

		goto err_remove_rx_link;

	}



	ret = snd_soc_register_component(dev, &soc_codec_dev_wcd938x,

					 wcd938x_dais, ARRAY_SIZE(wcd938x_dais));

	if (ret)

	if (ret) {

		dev_err(dev, "%s: Codec registration failed\n",

				__func__);

		goto err_remove_rx_link;

	}



	return ret;

	return 0;



err_remove_rx_link:

	device_link_remove(dev, wcd938x->rxdev);

err_remove_tx_link:

	device_link_remove(dev, wcd938x->txdev);

err_remove_rxtx_link:

	device_link_remove(wcd938x->rxdev, wcd938x->txdev);

err_put_txdev:

	put_device(wcd938x->txdev);

err_put_rxdev:

	put_device(wcd938x->rxdev);

err_unbind:

	component_unbind_all(dev, wcd938x);



	return ret;

}



static void wcd938x_unbind(struct device *dev)
@@ -3508,6 +3530,8 @@ static void wcd938x_unbind(struct device *dev) 
	device_link_remove(dev, wcd938x->txdev);

	device_link_remove(dev, wcd938x->rxdev);

	device_link_remove(wcd938x->rxdev, wcd938x->txdev);

	put_device(wcd938x->txdev);

	put_device(wcd938x->rxdev);

	component_unbind_all(dev, wcd938x);

}