diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-29 22:29:06 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-29 22:29:06 +0200 |
| commit | 1a81a8f2a5918956e214bb718099a89e500e7ec5 (patch) | |
| tree | 3ee00d0259b0f1c9f70784a835522365246ce7c0 /drivers/ide/hpt366.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
| parent | ide: missing break statement in set_timings_mdma() (diff) | |
| download | linux-1a81a8f2a5918956e214bb718099a89e500e7ec5.tar.xz linux-1a81a8f2a5918956e214bb718099a89e500e7ec5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull IDE updates from David Miller:
"Just a couple small bug fixes, nothing overly exciting in here"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
ide: missing break statement in set_timings_mdma()
ide: hpt366: fix incorrect mask when checking at cmd_high_time
ide-tape: fix misprint in failure handling in idetape_init()
cmd640: add __init attribute
Diffstat (limited to 'drivers/ide/hpt366.c')
| -rw-r--r-- | drivers/ide/hpt366.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c index f94baadbf424..0ceae5cbd89a 100644 --- a/drivers/ide/hpt366.c +++ b/drivers/ide/hpt366.c @@ -1012,7 +1012,7 @@ static int init_chipset_hpt366(struct pci_dev *dev) pci_read_config_dword(dev, 0x40, &itr1); /* Detect PCI clock by looking at cmd_high_time. */ - switch((itr1 >> 8) & 0x07) { + switch ((itr1 >> 8) & 0x0f) { case 0x09: pci_clk = 40; break; |