Merge branch 'for-3.17/core' of git://git.kernel.dk/linux-block

[pandora-kernel.git] / include / sound / pcm.h

diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index d854fb3..6f3e10c 100644 (file)
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -931,10 +931,17 @@ void snd_pcm_timer_done(struct snd_pcm_substream *substream);
 static inline void snd_pcm_gettime(struct snd_pcm_runtime *runtime,
                                   struct timespec *tv)
 {
-       if (runtime->tstamp_type == SNDRV_PCM_TSTAMP_TYPE_MONOTONIC)
+       switch (runtime->tstamp_type) {
+       case SNDRV_PCM_TSTAMP_TYPE_MONOTONIC:
                ktime_get_ts(tv);
-       else
+               break;
+       case SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW:
+               getrawmonotonic(tv);
+               break;
+       default:
                getnstimeofday(tv);
+               break;
+       }
 }
 
 /*