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

Commit a6aba536 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mark Brown
Browse files

ASoC: samsung: Handle errors when getting the op_clk clock 



Ensure i2s->op_clk is not used when clk_get() for this clock fails.
This prevents working with an incorrectly configured clock in some
conditions.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 1d55417e

sound/soc/samsung/i2s.c

+5 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, 
			clk_id = 1;



		if (!any_active(i2s)) {

			if (i2s->op_clk) {

			if (i2s->op_clk && !IS_ERR(i2s->op_clk)) {

				if ((clk_id && !(mod & MOD_IMS_SYSMUX)) ||

					(!clk_id && (mod & MOD_IMS_SYSMUX))) {

					clk_disable_unprepare(i2s->op_clk);
@@ -506,6 +506,10 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, 
			else

				i2s->op_clk = clk_get(&i2s->pdev->dev,

						"i2s_opclk0");



			if (WARN_ON(IS_ERR(i2s->op_clk)))

				return PTR_ERR(i2s->op_clk);



			clk_prepare_enable(i2s->op_clk);

			i2s->rclk_srcrate = clk_get_rate(i2s->op_clk);