Unverified Commit 25e06831 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: wmxxxx: Revert old "ASoC: wmxxxx: Fix PM disable depth imbalance in wmxxxx_probe" 

Merge series from Zhang Qilong <zhangqilong3@huawei.com>:

Both the old and new patch have been applied, it will resulted in
redundant calling of pm_runtime_disable when error returns. We Just
revert the old three patches to fix it.
parents 29eb79a9 68ce83e3

sound/soc/codecs/wm5102.c

+3 −3
Original line number Diff line number Diff line
@@ -2099,6 +2099,9 @@ static int wm5102_probe(struct platform_device *pdev) 
		regmap_update_bits(arizona->regmap, wm5102_digital_vu[i],

				   WM5102_DIG_VU, WM5102_DIG_VU);



	pm_runtime_enable(&pdev->dev);

	pm_runtime_idle(&pdev->dev);



	ret = arizona_request_irq(arizona, ARIZONA_IRQ_DSP_IRQ1,

				  "ADSP2 Compressed IRQ", wm5102_adsp2_irq,

				  wm5102);
@@ -2131,9 +2134,6 @@ static int wm5102_probe(struct platform_device *pdev) 
		goto err_spk_irqs;

	}



	pm_runtime_enable(&pdev->dev);

	pm_runtime_idle(&pdev->dev);



	return ret;



err_spk_irqs:

sound/soc/codecs/wm5110.c

+3 −3
Original line number Diff line number Diff line
@@ -2457,6 +2457,9 @@ static int wm5110_probe(struct platform_device *pdev) 
		regmap_update_bits(arizona->regmap, wm5110_digital_vu[i],

				   WM5110_DIG_VU, WM5110_DIG_VU);



	pm_runtime_enable(&pdev->dev);

	pm_runtime_idle(&pdev->dev);



	ret = arizona_request_irq(arizona, ARIZONA_IRQ_DSP_IRQ1,

				  "ADSP2 Compressed IRQ", wm5110_adsp2_irq,

				  wm5110);
@@ -2489,9 +2492,6 @@ static int wm5110_probe(struct platform_device *pdev) 
		goto err_spk_irqs;

	}



	pm_runtime_enable(&pdev->dev);

	pm_runtime_idle(&pdev->dev);



	return ret;



err_spk_irqs:

sound/soc/codecs/wm8997.c

+3 −3
Original line number Diff line number Diff line
@@ -1161,6 +1161,9 @@ static int wm8997_probe(struct platform_device *pdev) 
		regmap_update_bits(arizona->regmap, wm8997_digital_vu[i],

				   WM8997_DIG_VU, WM8997_DIG_VU);



	pm_runtime_enable(&pdev->dev);

	pm_runtime_idle(&pdev->dev);



	arizona_init_common(arizona);



	ret = arizona_init_vol_limit(arizona);
@@ -1179,9 +1182,6 @@ static int wm8997_probe(struct platform_device *pdev) 
		goto err_spk_irqs;

	}



	pm_runtime_enable(&pdev->dev);

	pm_runtime_idle(&pdev->dev);



	return ret;



err_spk_irqs: