diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2010-07-14 15:11:39 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-07-14 15:14:02 +0200 |
| commit | 992cbf743862916dfbfdd3238fe3fecffbab5dd3 (patch) | |
| tree | e7ab91619d2bf016d002a5b200e183a129bc888e /sound/oss | |
| parent | d209974cdc36aeeef406fa2019e9e1dacecbb979 (diff) | |
| download | kernel_samsung_crespo-992cbf743862916dfbfdd3238fe3fecffbab5dd3.zip kernel_samsung_crespo-992cbf743862916dfbfdd3238fe3fecffbab5dd3.tar.gz kernel_samsung_crespo-992cbf743862916dfbfdd3238fe3fecffbab5dd3.tar.bz2 | |
sound/oss-msnd-pinnacle: ioctl needs the inode
This broke in sound/oss: convert to unlocked_ioctl, when I missed one
of the ioctl functions still using the inode pointer.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/msnd_pinnacle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c index 9ffd29f..bfaac5f 100644 --- a/sound/oss/msnd_pinnacle.c +++ b/sound/oss/msnd_pinnacle.c @@ -641,7 +641,7 @@ static int mixer_ioctl(unsigned int cmd, unsigned long arg) static long dev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { - int minor = iminor(inode); + int minor = iminor(file->f_path.dentry->d_inode); int ret; if (cmd == OSS_GETVERSION) { |