diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-16 06:36:01 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-16 06:36:01 -1000 |
| commit | a2824f19e6065a0d3735acd9fe7155b104e7edf5 (patch) | |
| tree | 3f514882017d26da13cda226cb3f94eba6f26f04 /drivers/mtd/chips | |
| parent | b88bcc7d542c33ad3f5c042409d8ce0505cde1f8 (diff) | |
| parent | b48027083a78b13356695555a05b0e085e378687 (diff) | |
Merge tag 'mtd/fixes-for-5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux
Pull MTD fixes from Miquel Raynal:
"MTD core fixes:
- Fix lock hierarchy in deregister_mtd_blktrans
- Handle flashes without OTP gracefully
- Break circular locks in register_mtd_blktrans
MTD device fixes:
- mchp48l640:
- Fix memory leak on cmd
- Silence some uninitialized variable warnings
- blkdevs:
- Initialize rq.limits.discard_granularity
CFI fixes:
- Fix crash when erasing/writing AMD cards
Raw NAND fixes:
- Fix of_get_nand_secure_regions():
- Add a missing check
- Avoid an unwanted probe failure when a DT property is missing"
* tag 'mtd/fixes-for-5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
mtd: rawnand: Fix probe failure due to of_get_nand_secure_regions()
mtd: fix lock hierarchy in deregister_mtd_blktrans
mtd: devices: mchp48l640: Fix memory leak on cmd
mtd: cfi_cmdset_0002: fix crash when erasing/writing AMD cards
mtd: core: handle flashes without OTP gracefully
mtd: mchp48l640: silence some uninitialized variable warnings
mtd: break circular locks in register_mtd_blktrans
mtd: rawnand: Add a check in of_get_nand_secure_regions()
mtd: mtd_blkdevs: Initialize rq.limits.discard_granularity
Diffstat (limited to 'drivers/mtd/chips')
| -rw-r--r-- | drivers/mtd/chips/cfi_cmdset_0002.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index 3097e93787f7..a761134fd3be 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -119,7 +119,7 @@ static int cfi_use_status_reg(struct cfi_private *cfi) struct cfi_pri_amdstd *extp = cfi->cmdset_priv; u8 poll_mask = CFI_POLL_STATUS_REG | CFI_POLL_DQ; - return extp->MinorVersion >= '5' && + return extp && extp->MinorVersion >= '5' && (extp->SoftwareFeatures & poll_mask) == CFI_POLL_STATUS_REG; } |