]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
dsp56k: Fix BKL pushdown
authorGeert Uytterhoeven <geert@linux-m68k.org>
Sat, 26 Jul 2008 15:15:05 +0000 (17:15 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Jul 2008 20:22:56 +0000 (13:22 -0700)
commit 236b8756a2b6f90498d45b2c36d43e5372f2d4b8 ("dsp56k: BKL pushdown")
removed the `struct inode *inode' parameter from dsp56k_ioctl(), but
forgot to update the use of `inode' in the first line of the function.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/char/dsp56k.c

index 19b88504e960987fcd63880b3a8823ee2a2da366..ca7c72a486b2f1391d57b07621c19e28cb37d65d 100644 (file)
@@ -304,9 +304,9 @@ static ssize_t dsp56k_write(struct file *file, const char __user *buf, size_t co
 }
 
 static long dsp56k_ioctl(struct file *file, unsigned int cmd,
-                                                       unsigned long arg)
+                        unsigned long arg)
 {
-       int dev = iminor(inode) & 0x0f;
+       int dev = iminor(file->f_path.dentry->d_inode) & 0x0f;
        void __user *argp = (void __user *)arg;
 
        switch(dev)