diff options
| author | Yu Zhao <yuzhao@google.com> | 2018-09-11 15:15:16 -0600 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-09-12 11:22:09 +0100 |
| commit | 75383f8d39d4c0fb96083dd460b7b139fbdac492 (patch) | |
| tree | a67f7449b24e98e50d395fa79f65f9884d6169d5 /include/sound | |
| parent | b61749a89f826eb61fc59794d9e4697bd246eb61 (diff) | |
| download | linux-stable-75383f8d39d4c0fb96083dd460b7b139fbdac492.tar.gz linux-stable-75383f8d39d4c0fb96083dd460b7b139fbdac492.tar.bz2 linux-stable-75383f8d39d4c0fb96083dd460b7b139fbdac492.zip | |
sound: don't call skl_init_chip() to reset intel skl soc
Internally, skl_init_chip() calls snd_hdac_bus_init_chip() which
1) sets bus->chip_init to prevent multiple entrances before device
is stopped; 2) enables interrupt.
We shouldn't use it for the purpose of resetting device only because
1) when we really want to initialize device, we won't be able to do
so; 2) we are ready to handle interrupt yet, and kernel crashes when
interrupt comes in.
Rename azx_reset() to snd_hdac_bus_reset_link(), and use it to reset
device properly.
Fixes: 60767abcea3d ("ASoC: Intel: Skylake: Reset the controller in probe")
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Yu Zhao <yuzhao@google.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/hdaudio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h index ab5ee3ef2198..207e816ce6e1 100644 --- a/include/sound/hdaudio.h +++ b/include/sound/hdaudio.h @@ -384,6 +384,7 @@ void snd_hdac_bus_init_cmd_io(struct hdac_bus *bus); void snd_hdac_bus_stop_cmd_io(struct hdac_bus *bus); void snd_hdac_bus_enter_link_reset(struct hdac_bus *bus); void snd_hdac_bus_exit_link_reset(struct hdac_bus *bus); +int snd_hdac_bus_reset_link(struct hdac_bus *bus, bool full_reset); void snd_hdac_bus_update_rirb(struct hdac_bus *bus); int snd_hdac_bus_handle_stream_irq(struct hdac_bus *bus, unsigned int status, |