diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-29 13:29:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-29 13:29:06 -0700 |
| commit | 1a81a8f2a5918956e214bb718099a89e500e7ec5 (patch) | |
| tree | 3ee00d0259b0f1c9f70784a835522365246ce7c0 /drivers/ide | |
| parent | 86505fc06b6f1ee8a13473053a41ed01948e2d4f (diff) | |
| parent | d4f8c2e0f827a0b3a322c449ac331ae41feeb359 (diff) | |
| download | linux-stable-1a81a8f2a5918956e214bb718099a89e500e7ec5.tar.gz linux-stable-1a81a8f2a5918956e214bb718099a89e500e7ec5.tar.bz2 linux-stable-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')
| -rw-r--r-- | drivers/ide/cmd640.c | 2 | ||||
| -rw-r--r-- | drivers/ide/hpt366.c | 2 | ||||
| -rw-r--r-- | drivers/ide/ide-tape.c | 6 | ||||
| -rw-r--r-- | drivers/ide/pmac.c | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/drivers/ide/cmd640.c b/drivers/ide/cmd640.c index 70f0a2754c13..004243bd84db 100644 --- a/drivers/ide/cmd640.c +++ b/drivers/ide/cmd640.c @@ -695,7 +695,7 @@ static const struct ide_port_info cmd640_port_info __initconst = { .pio_mask = ATA_PIO5, }; -static int cmd640x_init_one(unsigned long base, unsigned long ctl) +static int __init cmd640x_init_one(unsigned long base, unsigned long ctl) { if (!request_region(base, 8, DRV_NAME)) { printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX not free.\n", 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; diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index 12fa04997dcc..9ecf4e35adcd 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c @@ -2052,12 +2052,12 @@ static int __init idetape_init(void) error = driver_register(&idetape_driver.gen_driver); if (error) - goto out_free_driver; + goto out_free_chrdev; return 0; -out_free_driver: - driver_unregister(&idetape_driver.gen_driver); +out_free_chrdev: + unregister_chrdev(IDETAPE_MAJOR, "ht"); out_free_class: class_destroy(idetape_sysfs_class); out: diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c index 7f0434f7e486..0c5d3a99468e 100644 --- a/drivers/ide/pmac.c +++ b/drivers/ide/pmac.c @@ -707,6 +707,7 @@ set_timings_mdma(ide_drive_t *drive, int intf_type, u32 *timings, u32 *timings2, *timings = ((*timings) & ~TR_133_PIOREG_MDMA_MASK) | tr; *timings2 = (*timings2) & ~TR_133_UDMAREG_UDMA_EN; } + break; case controller_un_ata6: case controller_k2_ata6: { /* 100Mhz cell */ |