2 files changed, 6 insertions, 7 deletions

diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 55f0961103a7..287ff0d35848 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -452,13 +452,8 @@ static int mtdchar_readoob(struct file *file, struct mtd_info *mtd,
         if (length > 4096)
                 return -EINVAL;
 
-        if (!mtd->read_oob)
-                ret = -EOPNOTSUPP;
-        else
-                ret = access_ok(VERIFY_WRITE, ptr,
-                                length) ? 0 : -EFAULT;
-        if (ret)
-                return ret;
+        if (!access_ok(VERIFY_WRITE, ptr, length))
+                return -EFAULT;
 
         ops.ooblen = length;
         ops.ooboffs = start & (mtd->writesize - 1);
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index b72964049cdc..721a63ffeb96 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -320,6 +320,8 @@ static inline int mtd_read_oob(struct mtd_info *mtd, loff_t from,
                                struct mtd_oob_ops *ops)
 {
         ops->retlen = ops->oobretlen = 0;
+        if (!mtd->read_oob)
+                return -EOPNOTSUPP;
         return mtd->read_oob(mtd, from, ops);
 }
 
@@ -327,6 +329,8 @@ static inline int mtd_write_oob(struct mtd_info *mtd, loff_t to,
                                 struct mtd_oob_ops *ops)
 {
         ops->retlen = ops->oobretlen = 0;
+        if (!mtd->write_oob)
+                return -EOPNOTSUPP;
         return mtd->write_oob(mtd, to, ops);
 }