ASoC: Intel: mfld-pcm: Change sst_ops prototypes to take dev parameter

[deliverable/linux.git] / sound / core / pcm_native.c

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index b653ab001fbac0778547b933815dff289240f7cf..8cd2f930ad0baf1db6646101b89e41f3d5947d57 100644 (file)
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -543,6 +543,9 @@ static int snd_pcm_sw_params(struct snd_pcm_substream *substream,
 
        if (params->tstamp_mode > SNDRV_PCM_TSTAMP_LAST)
                return -EINVAL;
+       if (params->proto >= SNDRV_PROTOCOL_VERSION(2, 0, 12) &&
+           params->tstamp_type > SNDRV_PCM_TSTAMP_TYPE_LAST)
+               return -EINVAL;
        if (params->avail_min == 0)
                return -EINVAL;
        if (params->silence_size >= runtime->boundary) {
@@ -557,6 +560,8 @@ static int snd_pcm_sw_params(struct snd_pcm_substream *substream,
        err = 0;
        snd_pcm_stream_lock_irq(substream);
        runtime->tstamp_mode = params->tstamp_mode;
+       if (params->proto >= SNDRV_PROTOCOL_VERSION(2, 0, 12))
+               runtime->tstamp_type = params->tstamp_type;
        runtime->period_step = params->period_step;
        runtime->control->avail_min = params->avail_min;
        runtime->start_threshold = params->start_threshold;
@@ -2540,9 +2545,7 @@ static int snd_pcm_tstamp(struct snd_pcm_substream *substream, int __user *_arg)
                return -EFAULT;
        if (arg < 0 || arg > SNDRV_PCM_TSTAMP_TYPE_LAST)
                return -EINVAL;
-       runtime->tstamp_type = SNDRV_PCM_TSTAMP_TYPE_GETTIMEOFDAY;
-       if (arg == SNDRV_PCM_TSTAMP_TYPE_MONOTONIC)
-               runtime->tstamp_type = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC;
+       runtime->tstamp_type = arg;
        return 0;
 }