diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-07-14 15:14:18 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-07-14 15:14:18 +0200 |
| commit | 7d442d2c13f0bd263f516733c50126ce6f1e85c7 (patch) | |
| tree | 0f800f0c52f2a4e5b4d5a7003654061d708ddb9c /sound | |
| parent | f467039b3d0c71ac5ec49117722934ddae77c9c3 (diff) | |
| parent | 992cbf743862916dfbfdd3238fe3fecffbab5dd3 (diff) | |
Merge branch 'topic/misc' into for-next
Diffstat (limited to 'sound')
| -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 9ffd29f32aa5..bfaac5fa13d7 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) { |