Unverified Commit 158ecc65 authored by Olivier Moysan's avatar Olivier Moysan Committed by Mark Brown
Browse files

ASoC: stm32: i2s: manage error when getting reset controller



Return an error when the i2s driver fails to get a reset controller.
Also add an error trace, except on probe defer status.

Signed-off-by: default avatarEtienne Carriere <etienne.carriere@st.com>
Signed-off-by: default avatarOlivier Moysan <olivier.moysan@st.com>
Link: https://lore.kernel.org/r/20200203100814.22944-4-olivier.moysan@st.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7889c008
Loading
Loading
Loading
Loading
+9 −5
Original line number Original line Diff line number Diff line
@@ -866,12 +866,16 @@ static int stm32_i2s_parse_dt(struct platform_device *pdev,
	}
	}


	/* Reset */
	/* Reset */
	rst = devm_reset_control_get_exclusive(&pdev->dev, NULL);
	rst = devm_reset_control_get_optional_exclusive(&pdev->dev, NULL);
	if (!IS_ERR(rst)) {
	if (IS_ERR(rst)) {
		if (PTR_ERR(rst) != -EPROBE_DEFER)
			dev_err(&pdev->dev, "Reset controller error %ld\n",
				PTR_ERR(rst));
		return PTR_ERR(rst);
	}
	reset_control_assert(rst);
	reset_control_assert(rst);
	udelay(2);
	udelay(2);
	reset_control_deassert(rst);
	reset_control_deassert(rst);
	}


	return 0;
	return 0;
}
}