1 files changed, 14 insertions, 5 deletions

diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 5b081cb84351..6749c2f96342 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -450,8 +450,7 @@ static int mtd_do_readoob(struct mtd_info *mtd, uint64_t start,
         return ret;
 }
 
-static int mtd_ioctl(struct inode *inode, struct file *file,
-                     u_int cmd, u_long arg)
+static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)
 {
         struct mtd_file_info *mfi = file->private_data;
         struct mtd_info *mtd = mfi->mtd;
@@ -822,6 +821,17 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
         return ret;
 } /* memory_ioctl */
 
+static long mtd_unlocked_ioctl(struct file *file, u_int cmd, u_long arg)
+{
+        int ret;
+
+        lock_kernel();
+        ret = mtd_ioctl(file, cmd, arg);
+        unlock_kernel();
+
+        return ret;
+}
+
 #ifdef CONFIG_COMPAT
 
 struct mtd_oob_buf32 {
@@ -836,7 +846,6 @@ 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 = compat_ptr(arg);
@@ -874,7 +883,7 @@ static long mtd_compat_ioctl(struct file *file, unsigned int cmd,
                 break;
         }
         default:
-                ret = mtd_ioctl(inode, file, cmd, (unsigned long)argp);
+                ret = mtd_ioctl(file, cmd, (unsigned long)argp);
         }
 
         unlock_kernel();
@@ -942,7 +951,7 @@ static const struct file_operations mtd_fops = {
         .llseek         = mtd_lseek,
         .read           = mtd_read,
         .write          = mtd_write,
-        .ioctl          = mtd_ioctl,
+        .unlocked_ioctl = mtd_unlocked_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = mtd_compat_ioctl,
 #endif