From 603f5568f24d9ee8f341a17b6138d920d059e7de Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Wed, 28 Dec 2011 17:50:34 +0200 Subject: [PATCH] --- yaml --- r: 282907 b: refs/heads/master c: dac2639f9833e858139d7e07f6ee45fb2191a9f2 h: refs/heads/master i: 282905: 07614530ad9be69b194deaa140968ee9851d246b 282903: cda55504a24ddb8e2454f21a9f1f428db9dcbc90 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/mtdchar.c | 9 ++------- trunk/include/linux/mtd/mtd.h | 4 ++++ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 248a22a73eb5..f123a5f68677 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 016c1291ce70a22f15f666441a4fd2f0b450375b +refs/heads/master: dac2639f9833e858139d7e07f6ee45fb2191a9f2 diff --git a/trunk/drivers/mtd/mtdchar.c b/trunk/drivers/mtd/mtdchar.c index 55f0961103a7..287ff0d35848 100644 --- a/trunk/drivers/mtd/mtdchar.c +++ b/trunk/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/trunk/include/linux/mtd/mtd.h b/trunk/include/linux/mtd/mtd.h index b72964049cdc..721a63ffeb96 100644 --- a/trunk/include/linux/mtd/mtd.h +++ b/trunk/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); }