summaryrefslogtreecommitdiff
path: root/sound/soc/intel/skylake/skl-pcm.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-02-12 11:48:51 +0300
committerTakashi Iwai <tiwai@suse.de>2016-02-12 11:48:51 +0300
commit86c2ee16704522a546c0ee1e8238096e3c391468 (patch)
treeeb8f363d8f89b4b434e651c44565a13f7dce2e34 /sound/soc/intel/skylake/skl-pcm.c
parent397da2d0ab0d1398242622d80a74df7245395c63 (diff)
parentf11aec0d7c835c3b83e74e3fd60d2e48a850c857 (diff)
downloadlinux-86c2ee16704522a546c0ee1e8238096e3c391468.tar.xz
Merge tag 'asoc-fix-v4.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.5 A rather large batch of fixes here, almost all in the Intel driver. The changes that got merged in this merge window for Skylake were rather large and as well as issues that you'd expect in a large block of new code there were some problems created for older processors which needed fixing up. Things are largely settling down now hopefully.
Diffstat (limited to 'sound/soc/intel/skylake/skl-pcm.c')
-rw-r--r--sound/soc/intel/skylake/skl-pcm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c
index f3553258091a..b6e6b61d10ec 100644
--- a/sound/soc/intel/skylake/skl-pcm.c
+++ b/sound/soc/intel/skylake/skl-pcm.c
@@ -863,6 +863,7 @@ static int skl_get_delay_from_lpib(struct hdac_ext_bus *ebus,
else
delay += hstream->bufsize;
}
+ delay = (hstream->bufsize == delay) ? 0 : delay;
if (delay >= hstream->period_bytes) {
dev_info(bus->dev,