diff options
| author | Linus Torvalds | 2018-08-22 16:40:33 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2018-08-22 16:40:33 +0200 |
| commit | 159127ea8318974b76542f62d6d23ec8bec91a28 (patch) | |
| tree | 33029bf5b0928b384b2aff6b8575d0e2be263829 /drivers/ide/sis5513.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
| parent | ide: mark expected switch fall-throughs (diff) | |
| download | kernel-qcow2-linux-159127ea8318974b76542f62d6d23ec8bec91a28.tar.gz kernel-qcow2-linux-159127ea8318974b76542f62d6d23ec8bec91a28.tar.xz kernel-qcow2-linux-159127ea8318974b76542f62d6d23ec8bec91a28.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull IDE updates from David Miller:
- Remove redundant variables (Colin Ian King)
- Expected switch fall-through annotations (Gustavo A. R. Silva)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
ide: mark expected switch fall-throughs
ide-tape: remove redundant variable buffer_size
ide: remove redundant variables queue_run_ms and left
Diffstat (limited to 'drivers/ide/sis5513.c')
| -rw-r--r-- | drivers/ide/sis5513.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c index c3062b53056f..024bc7ba49ee 100644 --- a/drivers/ide/sis5513.c +++ b/drivers/ide/sis5513.c @@ -494,6 +494,7 @@ static int init_chipset_sis5513(struct pci_dev *dev) pci_read_config_byte(dev, 0x09, ®); if ((reg & 0x0f) != 0x00) pci_write_config_byte(dev, 0x09, reg&0xf0); + /* fall through */ case ATA_16: /* force per drive recovery and active timings needed on ATA_33 and below chips */ |