diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
| commit | dbe1ab9514c231c9b062140a107d9dea0eabefcc (patch) | |
| tree | 0001c7143cf923fc704215f0a0e54221e9e5cbb9 /sound/core/pcm_compat.c | |
| parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
| download | linux-dbe1ab9514c231c9b062140a107d9dea0eabefcc.tar.bz2 | |
Merge branch 'master' into upstream
Diffstat (limited to 'sound/core/pcm_compat.c')
| -rw-r--r-- | sound/core/pcm_compat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c index e5133033de5e..2b8aab6fd6cd 100644 --- a/sound/core/pcm_compat.c +++ b/sound/core/pcm_compat.c @@ -497,9 +497,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: |