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 /include/linux/mtd | |
| 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 'include/linux/mtd')
| -rw-r--r-- | include/linux/mtd/mtd.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 887ebe318c75..d43dc25af82e 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h | |||
| @@ -427,9 +427,7 @@ static inline int mtd_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len) | |||
| 427 | 427 | ||
| 428 | static inline int mtd_suspend(struct mtd_info *mtd) | 428 | static inline int mtd_suspend(struct mtd_info *mtd) |
| 429 | { | 429 | { |
| 430 | if (!mtd->suspend) | 430 | return mtd->suspend ? mtd->suspend(mtd) : 0; |
| 431 | return -EOPNOTSUPP; | ||
| 432 | return mtd->suspend(mtd); | ||
| 433 | } | 431 | } |
| 434 | 432 | ||
| 435 | static inline void mtd_resume(struct mtd_info *mtd) | 433 | static inline void mtd_resume(struct mtd_info *mtd) |