diff options
author | Takashi Iwai <tiwai@suse.de> | 2020-01-20 11:44:35 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2020-01-20 11:44:51 +0100 |
commit | 9d0af44c2ed036c663832f3b764ffd1109c8b79e (patch) | |
tree | 629864b4ce2743873f672d2ca03c0e295fb98525 /sound/soc/sof/intel/hda-loader.c | |
parent | ALSA: hda/realtek - Add Headset Mic supported for HP cPC (diff) | |
parent | ALSA: hda: Apply aligned MMIO access only conditionally (diff) | |
download | linux-dev-9d0af44c2ed036c663832f3b764ffd1109c8b79e.tar.xz linux-dev-9d0af44c2ed036c663832f3b764ffd1109c8b79e.zip |
Merge branch 'for-linus' into for-next
Resolved the merge conflict in HD-audio Tegra driver.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/sof/intel/hda-loader.c')
-rw-r--r-- | sound/soc/sof/intel/hda-loader.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/sof/intel/hda-loader.c b/sound/soc/sof/intel/hda-loader.c index b1783360fe10..bae7ac3581e5 100644 --- a/sound/soc/sof/intel/hda-loader.c +++ b/sound/soc/sof/intel/hda-loader.c @@ -329,13 +329,13 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) if (!ret) break; - dev_err(sdev->dev, "error: Error code=0x%x: FW status=0x%x\n", + dev_dbg(sdev->dev, "iteration %d of Core En/ROM load failed: %d\n", + i, ret); + dev_dbg(sdev->dev, "Error code=0x%x: FW status=0x%x\n", snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_SRAM_REG_ROM_ERROR), snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_SRAM_REG_ROM_STATUS)); - dev_err(sdev->dev, "error: iteration %d of Core En/ROM load failed: %d\n", - i, ret); } if (i == HDA_FW_BOOT_ATTEMPTS) { |