diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-07-26 17:15:05 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 13:22:56 -0700 |
| commit | 689796a141cea79d745a4689c65dd01c39e5e100 (patch) | |
| tree | 32439d68526e71728b2983eafe52fbd9f66897bd | |
| parent | 37e67b75804b84e092ae9f1d7a19dc3522ef78ab (diff) | |
| download | blackbird-op-linux-689796a141cea79d745a4689c65dd01c39e5e100.tar.gz blackbird-op-linux-689796a141cea79d745a4689c65dd01c39e5e100.zip | |
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>
| -rw-r--r-- | drivers/char/dsp56k.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c index 19b88504e960..ca7c72a486b2 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) |
