diff options
author | Richard Weinberger <richard@nod.at> | 2020-10-11 22:07:52 +0200 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2020-10-11 22:07:52 +0200 |
commit | 80510e25522949711410b37a7864f1b2d98215d8 (patch) | |
tree | f3fb37900167a09da585169f68ceea7ee957f9d8 /drivers/scsi/BusLogic.c | |
parent | Merge tag 'nand/for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mt... (diff) | |
parent | Revert "mtd: spi-nor: Prefer asynchronous probe" (diff) | |
download | linux-80510e25522949711410b37a7864f1b2d98215d8.tar.xz linux-80510e25522949711410b37a7864f1b2d98215d8.zip |
Merge tag 'spi-nor/for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/next
SPI NOR core changes:
- Support for Winbond w25q64jwm flash
- Enable 4K sector support for mx25l12805d
SPI NOR controller drivers changes:
- intel-spi:
- Add Alder Lake-S PCI ID
Diffstat (limited to 'drivers/scsi/BusLogic.c')
-rw-r--r-- | drivers/scsi/BusLogic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c index bb49d83cadc7..ccb061ab0a0a 100644 --- a/drivers/scsi/BusLogic.c +++ b/drivers/scsi/BusLogic.c @@ -2635,7 +2635,7 @@ static int blogic_resultcode(struct blogic_adapter *adapter, case BLOGIC_BAD_CMD_PARAM: blogic_warn("BusLogic Driver Protocol Error 0x%02X\n", adapter, adapter_status); - /* fall through */ + fallthrough; case BLOGIC_DATA_UNDERRUN: case BLOGIC_DATA_OVERRUN: case BLOGIC_NOEXPECT_BUSFREE: |