|
@@ -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);
|
|
|
- ret = fsi_stream_transfer(io);
|
|
|
- if (0 == ret)
|
|
|
+ if (!ret)
|
|
|
+ ret = fsi_hw_startup(fsi, io, dai->dev);
|
|
|
+ if (!ret)
|
|
|
+ ret = fsi_stream_transfer(io);
|
|
|
+ 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;
|