summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-02-04 07:17:47 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-02-04 07:17:47 -0800
commit71b1b20b8aea6ba4a1a15736409f1261d8dfe1da (patch)
tree494acfa3fee2b77ee6104fc623f760c7253d3ccb /fs
parentd12566674c2d8d1275e197c01b44b481de42eda9 (diff)
parent500823195d0c9eec2a4637484f30cc93ec633d4a (diff)
downloadlinux-71b1b20b8aea6ba4a1a15736409f1261d8dfe1da.tar.gz
linux-71b1b20b8aea6ba4a1a15736409f1261d8dfe1da.tar.bz2
linux-71b1b20b8aea6ba4a1a15736409f1261d8dfe1da.zip
Merge tag 'for-linus-3.3' of git://git.infradead.org/~dwmw2/mtd-3.3
- Fix a regression in 16-bit Atmel NAND flash which was introduced in 3.1 - Fix breakage with MTD suspend caused by the API rework - Fix a problem with resetting the MX28 BCH module - A couple of other trivial fixes * tag 'for-linus-3.3-20120204' of git://git.infradead.org/~dwmw2/mtd-3.3: Revert "mtd: atmel_nand: optimize read/write buffer functions" mtd: fix MTD suspend jffs2: do not initialize variable unnecessarily mtd: gpmi-nand bugfix: reset the BCH module when it is not MX23 mtd: nand: fix typo in comment
Diffstat (limited to 'fs')
-rw-r--r--fs/jffs2/erase.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
index a01cdad6aad1..eafb8d37a6fb 100644
--- a/fs/jffs2/erase.c
+++ b/fs/jffs2/erase.c
@@ -335,7 +335,7 @@ static int jffs2_block_check_erase(struct jffs2_sb_info *c, struct jffs2_erasebl
void *ebuf;
uint32_t ofs;
size_t retlen;
- int ret = -EIO;
+ int ret;
unsigned long *wordebuf;
ret = mtd_point(c->mtd, jeb->offset, c->sector_size, &retlen,