projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d209974
)
sound/oss-msnd-pinnacle: ioctl needs the inode
author
Arnd Bergmann
<arnd@arndb.de>
Wed, 14 Jul 2010 13:11:39 +0000
(15:11 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Wed, 14 Jul 2010 13:14:02 +0000
(15:14 +0200)
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>
sound/oss/msnd_pinnacle.c
patch
|
blob
|
history
diff --git
a/sound/oss/msnd_pinnacle.c
b/sound/oss/msnd_pinnacle.c
index
9ffd29f
..
bfaac5f
100644
(file)
--- 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) {