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/hda | |
| parent | df4654bd6e42125d9b85ce3a26eaca2935290b98 (diff) | |
| parent | 92adc96f8eecd9522a907c197cc3d62e405539fe (diff) | |
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/hda')
| -rw-r--r-- | sound/hda/hdac_stream.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/hda/hdac_stream.c b/sound/hda/hdac_stream.c index f9707fb05efe..682ed39f79b0 100644 --- a/sound/hda/hdac_stream.c +++ b/sound/hda/hdac_stream.c @@ -120,10 +120,8 @@ void snd_hdac_stream_clear(struct hdac_stream *azx_dev) snd_hdac_stream_updateb(azx_dev, SD_CTL, SD_CTL_DMA_START | SD_INT_MASK, 0); snd_hdac_stream_writeb(azx_dev, SD_STS, SD_INT_MASK); /* to be sure */ - if (azx_dev->stripe) { + if (azx_dev->stripe) snd_hdac_stream_updateb(azx_dev, SD_CTL_3B, SD_CTL_STRIPE_MASK, 0); - azx_dev->stripe = 0; - } azx_dev->running = false; } EXPORT_SYMBOL_GPL(snd_hdac_stream_clear); |