From 681c9ce6564c387695bc5d5f267c95d21e3d54f2 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Sat, 26 Jul 2008 17:15:05 +0200 Subject: [PATCH] --- yaml --- r: 106273 b: refs/heads/master c: 689796a141cea79d745a4689c65dd01c39e5e100 h: refs/heads/master i: 106271: fe2fab72640187bc5ad9f4ccf7cb0520aac76d76 v: v3 --- [refs] | 2 +- trunk/drivers/char/dsp56k.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a471c68f016d..fd67386d6ad5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37e67b75804b84e092ae9f1d7a19dc3522ef78ab +refs/heads/master: 689796a141cea79d745a4689c65dd01c39e5e100 diff --git a/trunk/drivers/char/dsp56k.c b/trunk/drivers/char/dsp56k.c index 19b88504e960..ca7c72a486b2 100644 --- a/trunk/drivers/char/dsp56k.c +++ b/trunk/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)