redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Kuninori Morimoto 2012-10-30 19:59:15 -07:00 committed by Mark Brown
parent ddeb2d701b
commit 80b4addc9c
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sound/soc/sh/fsi.c
View file

@ -1335,17 +1335,19 @@ static int fsi_hw_startup(struct fsi_priv *fsi,
/* start master clock */ /* start master clock */
if (fsi_is_clk_master(fsi)) 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; return 0;
} }
static void fsi_hw_shutdown(struct fsi_priv *fsi, static int fsi_hw_shutdown(struct fsi_priv *fsi,
struct device *dev) struct device *dev)
{ {
/* stop master clock */ /* stop master clock */
if (fsi_is_clk_master(fsi)) 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, 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) { switch (cmd) {
case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_START:
fsi_stream_init(fsi, io, substream); fsi_stream_init(fsi, io, substream);
fsi_hw_startup(fsi, io, dai->dev); if (!ret)
ret = fsi_stream_transfer(io); ret = fsi_hw_startup(fsi, io, dai->dev);
if (0 == ret) if (!ret)
ret = fsi_stream_transfer(io);
if (!ret)
fsi_stream_start(fsi, io); fsi_stream_start(fsi, io);
break; break;
case SNDRV_PCM_TRIGGER_STOP: 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_stop(fsi, io);
fsi_stream_quit(fsi, io); fsi_stream_quit(fsi, io);
break; break;