Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...

[linux-2.6-omap-h63xx.git] / sound / core / pcm_compat.c

diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
index e5133033de5e5fdf049ab51d2001677c58555738..49aa693fba8adb8507d892a3fdc8081960d8c4ce 100644 (file)
--- a/sound/core/pcm_compat.c
+++ b/sound/core/pcm_compat.c
@@ -478,12 +478,13 @@ static long snd_pcm_ioctl_compat(struct file *file, unsigned int cmd, unsigned l
         * mmap of PCM status/control records because of the size
         * incompatibility.
         */
-       substream->no_mmap_ctrl = 1;
+       pcm_file->no_compat_mmap = 1;
 
        switch (cmd) {
        case SNDRV_PCM_IOCTL_PVERSION:
        case SNDRV_PCM_IOCTL_INFO:
        case SNDRV_PCM_IOCTL_TSTAMP:
+       case SNDRV_PCM_IOCTL_TTSTAMP:
        case SNDRV_PCM_IOCTL_HWSYNC:
        case SNDRV_PCM_IOCTL_PREPARE:
        case SNDRV_PCM_IOCTL_RESET:
@@ -497,9 +498,9 @@ static long snd_pcm_ioctl_compat(struct file *file, unsigned int cmd, unsigned l
        case SNDRV_PCM_IOCTL_LINK:
        case SNDRV_PCM_IOCTL_UNLINK:
                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                       return snd_pcm_playback_ioctl1(substream, cmd, argp);
+                       return snd_pcm_playback_ioctl1(file, substream, cmd, argp);
                else
-                       return snd_pcm_capture_ioctl1(substream, cmd, argp);
+                       return snd_pcm_capture_ioctl1(file, substream, cmd, argp);
        case SNDRV_PCM_IOCTL_HW_REFINE32:
                return snd_pcm_ioctl_hw_params_compat(substream, 1, argp);
        case SNDRV_PCM_IOCTL_HW_PARAMS32: