Merge tag 'sound-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[uclinux-h8/linux.git] / sound / soc / intel / atom / sst / sst_drv_interface.c

diff --git a/sound/soc/intel/atom/sst/sst_drv_interface.c b/sound/soc/intel/atom/sst/sst_drv_interface.c
index 7b50a9d..620da1d 100644 (file)
--- a/sound/soc/intel/atom/sst/sst_drv_interface.c
+++ b/sound/soc/intel/atom/sst/sst_drv_interface.c
@@ -533,7 +533,7 @@ static inline int sst_calc_tstamp(struct intel_sst_drv *ctx,
 
        info->buffer_ptr = pointer_samples / substream->runtime->channels;
 
-       info->pcm_delay = delay_frames / substream->runtime->channels;
+       info->pcm_delay = delay_frames;
        dev_dbg(ctx->dev, "buffer ptr %llu pcm_delay rep: %llu\n",
                        info->buffer_ptr, info->pcm_delay);
        return 0;