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

Commit d2f916aa authored by Jon Medhurst (Tixy)'s avatar Jon Medhurst (Tixy) Committed by Mark Brown
Browse files

ASoC: dwc: Ensure i2s_reg_comp{1,2} is always initialised 



In the case that the driver is configured from device-tree
i2s_reg_comp1 and i2s_reg_comp2 aren't initialised, breaking the driver.
Fix this by unconditionally setting these values before checking for quirks.

Fixes: a242cac1 ("ASoC: dwc: add quirk to override COMP_PARAM_1 register")
Signed-off-by: default avatarJon Medhurst <tixy@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 92e963f5

sound/soc/dwc/designware_i2s.c

+2 −3
Original line number Diff line number Diff line
@@ -645,6 +645,8 @@ static int dw_i2s_probe(struct platform_device *pdev) 


	dev->dev = &pdev->dev;



	dev->i2s_reg_comp1 = I2S_COMP_PARAM_1;

	dev->i2s_reg_comp2 = I2S_COMP_PARAM_2;

	if (pdata) {

		dev->capability = pdata->cap;

		clk_id = NULL;
@@ -652,9 +654,6 @@ static int dw_i2s_probe(struct platform_device *pdev) 
		if (dev->quirks & DW_I2S_QUIRK_COMP_REG_OFFSET) {

			dev->i2s_reg_comp1 = pdata->i2s_reg_comp1;

			dev->i2s_reg_comp2 = pdata->i2s_reg_comp2;

		} else {

			dev->i2s_reg_comp1 = I2S_COMP_PARAM_1;

			dev->i2s_reg_comp2 = I2S_COMP_PARAM_2;

		}

		ret = dw_configure_dai_by_pd(dev, dw_i2s_dai, res, pdata);

	} else {