Merge branch 'for-5.4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[platform/kernel/linux-rpi.git] / sound / soc / sof / intel / hda-stream.c

diff --git a/sound/soc/sof/intel/hda-stream.c b/sound/soc/sof/intel/hda-stream.c
index 0c11fce..29ab432 100644 (file)
--- a/sound/soc/sof/intel/hda-stream.c
+++ b/sound/soc/sof/intel/hda-stream.c
@@ -275,8 +275,12 @@ int hda_dsp_stream_trigger(struct snd_sof_dev *sdev,
                                        HDA_DSP_REG_POLL_INTERVAL_US,
                                        HDA_DSP_STREAM_RUN_TIMEOUT);
 
-               if (ret)
+               if (ret < 0) {
+                       dev_err(sdev->dev,
+                               "error: %s: cmd %d: timeout on STREAM_SD_OFFSET read\n",
+                               __func__, cmd);
                        return ret;
+               }
 
                hstream->running = true;
                break;
@@ -294,8 +298,12 @@ int hda_dsp_stream_trigger(struct snd_sof_dev *sdev,
                                                HDA_DSP_REG_POLL_INTERVAL_US,
                                                HDA_DSP_STREAM_RUN_TIMEOUT);
 
-               if (ret)
+               if (ret < 0) {
+                       dev_err(sdev->dev,
+                               "error: %s: cmd %d: timeout on STREAM_SD_OFFSET read\n",
+                               __func__, cmd);
                        return ret;
+               }
 
                snd_sof_dsp_write(sdev, HDA_DSP_HDA_BAR, sd_offset +
                                  SOF_HDA_ADSP_REG_CL_SD_STS,
@@ -356,8 +364,12 @@ int hda_dsp_stream_hw_params(struct snd_sof_dev *sdev,
                                            HDA_DSP_REG_POLL_INTERVAL_US,
                                            HDA_DSP_STREAM_RUN_TIMEOUT);
 
-       if (ret)
+       if (ret < 0) {
+               dev_err(sdev->dev,
+                       "error: %s: timeout on STREAM_SD_OFFSET read1\n",
+                       __func__);
                return ret;
+       }
 
        snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR,
                                sd_offset + SOF_HDA_ADSP_REG_CL_SD_STS,
@@ -418,8 +430,12 @@ int hda_dsp_stream_hw_params(struct snd_sof_dev *sdev,
                                            HDA_DSP_REG_POLL_INTERVAL_US,
                                            HDA_DSP_STREAM_RUN_TIMEOUT);
 
-       if (ret)
+       if (ret < 0) {
+               dev_err(sdev->dev,
+                       "error: %s: timeout on STREAM_SD_OFFSET read2\n",
+                       __func__);
                return ret;
+       }
 
        snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR,
                                sd_offset + SOF_HDA_ADSP_REG_CL_SD_STS,