diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-27 10:14:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-27 10:14:52 -0700 |
| commit | 03498b7131b874166724ca016178932d0b5781aa (patch) | |
| tree | 31b100c21e7d04fab9a2ce69b192f40798f2f260 /include | |
| parent | floppy: disable FDRAWCMD by default (diff) | |
| parent | mtd: rawnand: qcom: fix memory corruption that causes panic (diff) | |
| download | linux-dev-03498b7131b874166724ca016178932d0b5781aa.tar.xz linux-dev-03498b7131b874166724ca016178932d0b5781aa.zip | |
Merge tag 'mtd/fixes-for-5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux
Pull MTD fixes from Miquel Raynal:
"Core fix:
- Fix a possible data corruption of the 'part' field in mtd_info
Rawnand fixes:
- Fix the check on the return value of wait_for_completion_timeout
- Fix wrong ECC parameters for mt7622
- Fix a possible memory corruption that might panic in the Qcom
driver"
* tag 'mtd/fixes-for-5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
mtd: rawnand: qcom: fix memory corruption that causes panic
mtd: fix 'part' field data corruption in mtd_info
mtd: rawnand: Fix return value check of wait_for_completion_timeout
mtd: rawnand: fix ecc parameters for mt7622
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mtd/mtd.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 151607e9d64a..955aee14b0f7 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -389,10 +389,8 @@ struct mtd_info { /* List of partitions attached to this MTD device */ struct list_head partitions; - union { - struct mtd_part part; - struct mtd_master master; - }; + struct mtd_part part; + struct mtd_master master; }; static inline struct mtd_info *mtd_get_master(struct mtd_info *mtd) |