From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sat, 26 Jul 2008 15:15:05 +0000 (+0200)
Subject: dsp56k: Fix BKL pushdown
X-Git-Tag: v2.6.27-rc1~84
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=689796a141cea79d745a4689c65dd01c39e5e100;p=linux-2.6-omap-h63xx.git

dsp56k: Fix BKL pushdown

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

diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index 19b88504e96..ca7c72a486b 100644
--- a/drivers/char/dsp56k.c
+++ b/drivers/char/dsp56k.c
@@ -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)