diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-04 10:17:47 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-04 10:17:47 -0500 |
| commit | 71b1b20b8aea6ba4a1a15736409f1261d8dfe1da (patch) | |
| tree | 494acfa3fee2b77ee6104fc623f760c7253d3ccb /fs | |
| parent | d12566674c2d8d1275e197c01b44b481de42eda9 (diff) | |
| parent | 500823195d0c9eec2a4637484f30cc93ec633d4a (diff) | |
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.c | 2 |
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 | |||
| 335 | void *ebuf; | 335 | void *ebuf; |
| 336 | uint32_t ofs; | 336 | uint32_t ofs; |
| 337 | size_t retlen; | 337 | size_t retlen; |
| 338 | int ret = -EIO; | 338 | int ret; |
| 339 | unsigned long *wordebuf; | 339 | unsigned long *wordebuf; |
| 340 | 340 | ||
| 341 | ret = mtd_point(c->mtd, jeb->offset, c->sector_size, &retlen, | 341 | ret = mtd_point(c->mtd, jeb->offset, c->sector_size, &retlen, |