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

Commit 80b4addc authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: fsi: care fsi_hw_start/stop() return value 



Current FSI driver didn't care fsi_hw_start/stop() return value,
and it causes WARNING() call if SNDRV_PCM_TRIGGER_START failed.
This patch solved this issue

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent ddeb2d70

sound/soc/sh/fsi.c

+12 −7
Original line number Diff line number Diff line
@@ -1335,17 +1335,19 @@ static int fsi_hw_startup(struct fsi_priv *fsi, 


	/* start master clock */

	if (fsi_is_clk_master(fsi))

		fsi_set_master_clk(dev, fsi, fsi->rate, 1);

		return fsi_set_master_clk(dev, fsi, fsi->rate, 1);



	return 0;

}



static void fsi_hw_shutdown(struct fsi_priv *fsi,

static int fsi_hw_shutdown(struct fsi_priv *fsi,

			    struct device *dev)

{

	/* stop master clock */

	if (fsi_is_clk_master(fsi))

		fsi_set_master_clk(dev, fsi, fsi->rate, 0);

		return fsi_set_master_clk(dev, fsi, fsi->rate, 0);



	return 0;

}



static int fsi_dai_startup(struct snd_pcm_substream *substream,
@@ -1376,13 +1378,16 @@ static int fsi_dai_trigger(struct snd_pcm_substream *substream, int cmd, 
	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:

		fsi_stream_init(fsi, io, substream);

		fsi_hw_startup(fsi, io, dai->dev);

		if (!ret)

			ret = fsi_hw_startup(fsi, io, dai->dev);

		if (!ret)

			ret = fsi_stream_transfer(io);

		if (0 == ret)

		if (!ret)

			fsi_stream_start(fsi, io);

		break;

	case SNDRV_PCM_TRIGGER_STOP:

		fsi_hw_shutdown(fsi, dai->dev);

		if (!ret)

			ret = fsi_hw_shutdown(fsi, dai->dev);

		fsi_stream_stop(fsi, io);

		fsi_stream_quit(fsi, io);

		break;