summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/mtdchar.c
diff options
context:
space:
mode:
authorKevin Cernekee <kpc.mtd@gmail.com>2009-04-14 21:59:22 -0700
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-05-29 15:58:25 +0100
commit668ff9ab45d595222d3f90d7974ccba3518e3bb3 (patch)
treec1d645633f460276b1e7d43a897852b2fab3c509 /drivers/mtd/mtdchar.c
parentaea7cea9fa9e39e71f95ad70b3daf98ba9972587 (diff)
downloadblackbird-op-linux-668ff9ab45d595222d3f90d7974ccba3518e3bb3.tar.gz
blackbird-op-linux-668ff9ab45d595222d3f90d7974ccba3518e3bb3.zip
mtd: Handle compat ioctls directly; remove all trace from compat_ioctl.c
Remove all references to MTD ioctls from fs/compat_ioctl.c and let them all be handled by mtd_compat_ioctl(). Signed-off-by: Kevin Cernekee <kpc.mtd@gmail.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/mtdchar.c')
-rw-r--r--drivers/mtd/mtdchar.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 99d1fbc95011..5fff04f3303d 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -836,6 +836,7 @@ struct mtd_oob_buf32 {
static long mtd_compat_ioctl(struct file *file, unsigned int cmd,
unsigned long arg)
{
+ struct inode *inode = file->f_path.dentry->d_inode;
struct mtd_file_info *mfi = file->private_data;
struct mtd_info *mtd = mfi->mtd;
void __user *argp = (void __user *)arg;
@@ -873,7 +874,7 @@ static long mtd_compat_ioctl(struct file *file, unsigned int cmd,
break;
}
default:
- ret = -ENOIOCTLCMD;
+ ret = mtd_ioctl(inode, file, cmd, arg);
}
unlock_kernel();
OpenPOWER on IntegriCloud