diff options
author | Takashi Iwai <tiwai@suse.de> | 2019-12-18 20:05:39 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2019-12-18 20:07:43 +0100 |
commit | a032ff0e8065668e672eb2e223e265b7808f35a3 (patch) | |
tree | 90c43579c425f8789fc9cec99c8ea39ba6c26874 /sound/pci/hda/hda_controller.c | |
parent | df4654bd6e42125d9b85ce3a26eaca2935290b98 (diff) | |
parent | 92adc96f8eecd9522a907c197cc3d62e405539fe (diff) | |
download | talos-op-linux-a032ff0e8065668e672eb2e223e265b7808f35a3.tar.gz talos-op-linux-a032ff0e8065668e672eb2e223e265b7808f35a3.zip |
Merge branch 'for-linus' into for-next
Taking the 5.5 devel branch back into the main devel branch.
A USB-audio fix needs to be adjusted to adapt the changes that have
been formerly applied for stop_sync.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_controller.c')
-rw-r--r-- | sound/pci/hda/hda_controller.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c index 78005ddb7050..a74c85867eb3 100644 --- a/sound/pci/hda/hda_controller.c +++ b/sound/pci/hda/hda_controller.c @@ -835,7 +835,7 @@ static int azx_rirb_get_response(struct hdac_bus *bus, unsigned int addr, return -EAGAIN; /* give a chance to retry */ } - dev_WARN(chip->card->dev, + dev_err(chip->card->dev, "azx_get_response timeout, switching to single_cmd mode: last cmd=0x%08x\n", bus->last_cmd[addr]); chip->single_cmd = 1; |