summaryrefslogtreecommitdiff
path: root/include/linux/mtd/mtd.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2012-02-07 08:59:29 (GMT)
committerIngo Molnar <mingo@elte.hu>2012-02-07 08:59:29 (GMT)
commit290436c9c61ac983b1bd425da67242a4357c7701 (patch)
tree35e1f189b62eb50515600ad607d7fb57fc547870 /include/linux/mtd/mtd.h
parent623ec991ce0e8cd5791bad656c162fa837635907 (diff)
parent62aa2b537c6f5957afd98e29f96897419ed5ebab (diff)
downloadlinux-fsl-qoriq-290436c9c61ac983b1bd425da67242a4357c7701.tar.xz
Merge tag 'v3.3-rc2' into perf/core
Linux 3.3-rc2 Pick up the latest fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/mtd/mtd.h')
-rw-r--r--include/linux/mtd/mtd.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 1a81fde..2212952 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -441,7 +441,7 @@ static inline void mtd_resume(struct mtd_info *mtd)
static inline int mtd_block_isbad(struct mtd_info *mtd, loff_t ofs)
{
if (!mtd->block_isbad)
- return -EOPNOTSUPP;
+ return 0;
return mtd->block_isbad(mtd, ofs);
}
@@ -489,7 +489,7 @@ static inline int mtd_has_oob(const struct mtd_info *mtd)
static inline int mtd_can_have_bb(const struct mtd_info *mtd)
{
- return !!mtd->block_isbad;
+ return 0;
}
/* Kernel-side ioctl definitions */