Unverified Commit 487db53b authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: mediatek: mt8173: Fix error paths 

Merge series from Ricardo Ribalda Delgado <ribalda@chromium.org>:

ASoC: mediatek: mt8173, presented a couple of error paths errors, lets
fix them.
parents fd6f2236 f9c058d1

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

+7 −6
Original line number Diff line number Diff line
@@ -1070,6 +1070,10 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev) 


	afe->dev = &pdev->dev;



	irq_id = platform_get_irq(pdev, 0);

	if (irq_id <= 0)

		return irq_id < 0 ? irq_id : -ENXIO;



	afe->base_addr = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(afe->base_addr))

		return PTR_ERR(afe->base_addr);
@@ -1156,14 +1160,14 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev) 
	comp_hdmi = devm_kzalloc(&pdev->dev, sizeof(*comp_hdmi), GFP_KERNEL);

	if (!comp_hdmi) {

		ret = -ENOMEM;

		goto err_pm_disable;

		goto err_cleanup_components;

	}



	ret = snd_soc_component_initialize(comp_hdmi,

					   &mt8173_afe_hdmi_dai_component,

					   &pdev->dev);

	if (ret)

		goto err_pm_disable;

		goto err_cleanup_components;



#ifdef CONFIG_DEBUG_FS

	comp_hdmi->debugfs_prefix = "hdmi";
@@ -1175,14 +1179,11 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev) 
	if (ret)

		goto err_cleanup_components;



	irq_id = platform_get_irq(pdev, 0);

	if (irq_id <= 0)

		return irq_id < 0 ? irq_id : -ENXIO;

	ret = devm_request_irq(afe->dev, irq_id, mt8173_afe_irq_handler,

			       0, "Afe_ISR_Handle", (void *)afe);

	if (ret) {

		dev_err(afe->dev, "could not request_irq\n");

		goto err_pm_disable;

		goto err_cleanup_components;

	}



	dev_info(&pdev->dev, "MT8173 AFE driver initialized.\n");