1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 94eb05b1afdf..f2f482bec573 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -106,16 +106,14 @@ static int mtdchar_open(struct inode *inode, struct file *file)
         }
 
         if (mtd->type == MTD_ABSENT) {
-                put_mtd_device(mtd);
                 ret = -ENODEV;
-                goto out;
+                goto out1;
         }
 
         mtd_ino = iget_locked(mnt->mnt_sb, devnum);
         if (!mtd_ino) {
-                put_mtd_device(mtd);
                 ret = -ENOMEM;
-                goto out;
+                goto out1;
         }
         if (mtd_ino->i_state & I_NEW) {
                 mtd_ino->i_private = mtd;
@@ -127,23 +125,25 @@ static int mtdchar_open(struct inode *inode, struct file *file)
 
         /* You can't open it RW if it's not a writeable device */
         if ((file->f_mode & FMODE_WRITE) && !(mtd->flags & MTD_WRITEABLE)) {
-                iput(mtd_ino);
-                put_mtd_device(mtd);
                 ret = -EACCES;
-                goto out;
+                goto out2;
         }
 
         mfi = kzalloc(sizeof(*mfi), GFP_KERNEL);
         if (!mfi) {
-                iput(mtd_ino);
-                put_mtd_device(mtd);
                 ret = -ENOMEM;
-                goto out;
+                goto out2;
         }
         mfi->ino = mtd_ino;
         mfi->mtd = mtd;
         file->private_data = mfi;
+        mutex_unlock(&mtd_mutex);
+        return 0;
 
+out2:
+        iput(mtd_ino);
+out1:
+        put_mtd_device(mtd);
 out:
         mutex_unlock(&mtd_mutex);
         simple_release_fs(&mnt, &count);
@@ -376,7 +376,7 @@ static int otp_select_filemode(struct mtd_file_info *mfi, int mode)
          * Make a fake call to mtd_read_fact_prot_reg() to check if OTP
          * operations are supported.
          */
-        if (mtd_read_fact_prot_reg(mtd, -1, -1, &retlen, NULL) == -EOPNOTSUPP)
+        if (mtd_read_fact_prot_reg(mtd, -1, 0, &retlen, NULL) == -EOPNOTSUPP)
                 return -EOPNOTSUPP;
 
         switch (mode) {