Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit dc2a17f4 authored by Ryder Lee's avatar Ryder Lee Committed by Mark Brown
Browse files

ASoC: mediatek: fix double free in mt2701_afe_pcm_dev_probe() 



The commit dfa3cbb8(ASoC: mediatek: modify MT2701 AFE driver to adapt mfd device)
leads to the following static checker warning:

	sound/soc/mediatek/mt2701/mt2701-afe-pcm.c:1535 mt2701_afe_pcm_dev_probe()
	error: double free of 'component'

This patch fixes that and adds a helper mt2701_afe_add_component() to setup
component.

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 11aa2d96

sound/soc/mediatek/mt2701/mt2701-afe-pcm.c

+18 −14
Original line number Original line Diff line number Diff line
@@ -1405,9 +1405,24 @@ static int mt2701_afe_runtime_resume(struct device *dev) 
	return mt2701_afe_enable_clock(afe);

	return mt2701_afe_enable_clock(afe);

}

}





static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev)

static int mt2701_afe_add_component(struct mtk_base_afe *afe)

{

{

	struct snd_soc_component *component;

	struct snd_soc_component *component;



	component = kzalloc(sizeof(*component), GFP_KERNEL);

	if (!component)

		return -ENOMEM;



	component->regmap = afe->regmap;



	return snd_soc_add_component(afe->dev, component,

				     &mt2701_afe_pcm_dai_component,

				     mt2701_afe_pcm_dais,

				     ARRAY_SIZE(mt2701_afe_pcm_dais));

}



static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev)

{

	struct mtk_base_afe *afe;

	struct mtk_base_afe *afe;

	struct mt2701_afe_private *afe_priv;

	struct mt2701_afe_private *afe_priv;

	struct device *dev;

	struct device *dev;
@@ -1477,12 +1492,6 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev) 
			= &mt2701_i2s_data[i][I2S_IN];

			= &mt2701_i2s_data[i][I2S_IN];

	}

	}





	component = kzalloc(sizeof(*component), GFP_KERNEL);

	if (!component)

		return -ENOMEM;



	component->regmap = afe->regmap;



	afe->mtk_afe_hardware = &mt2701_afe_hardware;

	afe->mtk_afe_hardware = &mt2701_afe_hardware;

	afe->memif_fs = mt2701_memif_fs;

	afe->memif_fs = mt2701_memif_fs;

	afe->irq_fs = mt2701_irq_fs;

	afe->irq_fs = mt2701_irq_fs;
@@ -1495,7 +1504,7 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev) 
	ret = mt2701_init_clock(afe);

	ret = mt2701_init_clock(afe);

	if (ret) {

	if (ret) {

		dev_err(dev, "init clock error\n");

		dev_err(dev, "init clock error\n");

		goto err_init_clock;

		return ret;

	}

	}





	platform_set_drvdata(pdev, afe);

	platform_set_drvdata(pdev, afe);
@@ -1514,10 +1523,7 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev) 
		goto err_platform;

		goto err_platform;

	}

	}





	ret = snd_soc_add_component(dev, component,

	ret = mt2701_afe_add_component(afe);

				    &mt2701_afe_pcm_dai_component,

				    mt2701_afe_pcm_dais,

				    ARRAY_SIZE(mt2701_afe_pcm_dais));

	if (ret) {

	if (ret) {

		dev_warn(dev, "err_dai_component\n");

		dev_warn(dev, "err_dai_component\n");

		goto err_dai_component;

		goto err_dai_component;
@@ -1531,8 +1537,6 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev) 
	pm_runtime_put_sync(dev);

	pm_runtime_put_sync(dev);

err_pm_disable:

err_pm_disable:

	pm_runtime_disable(dev);

	pm_runtime_disable(dev);

err_init_clock:

	kfree(component);





	return ret;

	return ret;

}

}