lkml.org 
[lkml]   [2010]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subjectsound/oss-msnd-pinnacle: ioctl needs the inode
Date
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>
---
On Tuesday 13 July 2010, Randy Dunlap wrote:
> On Tue, 13 Jul 2010 14:40:07 +1000 Stephen Rothwell wrote:
> > Hi all,
> >
> > Not unexpectedly, we got some conflicts with the arm defconfig files
> > today ...
>
>
> sound/oss/msnd_pinnacle.c:644:error: 'inode' undeclared (first use in this function)
>

Sorry about that, my fault. Please apply.

I checked all the other files I touched in the same patch, they either did
not have this problem, or I had done it correctly.

--- 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) {

\
 
 \ /
  Last update: 2010-07-14 15:15    [from the cache]
©2003-2011 Jasper Spaans