UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide 

Pull IDE fixes from David Miller:
 - fix interrupt registry for some Atari IDE chipsets.
 - adjust Kconfig dependencies for x86_32 specific chips.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: Fix SC1200 dependencies
  ide: Fix CS5520 and CS5530 dependencies
  m68k/atari - ide: do not register interrupt if host->get_lock is set
This commit is contained in:
Linus Torvalds 2014-07-21 22:44:24 -07:00
parent 8dcc3be2a4 5b40dd30bb
commit 1486771961
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/ide/Kconfig
View File

@ -416,6 +416,7 @@ config BLK_DEV_CY82C693
config BLK_DEV_CS5520 config BLK_DEV_CS5520
tristate "Cyrix CS5510/20 MediaGX chipset support (VERY EXPERIMENTAL)" tristate "Cyrix CS5510/20 MediaGX chipset support (VERY EXPERIMENTAL)"
depends on X86_32 || COMPILE_TEST
select BLK_DEV_IDEDMA_PCI select BLK_DEV_IDEDMA_PCI
help help
Include support for PIO tuning and virtual DMA on the Cyrix MediaGX Include support for PIO tuning and virtual DMA on the Cyrix MediaGX
@ -426,6 +427,7 @@ config BLK_DEV_CS5520
config BLK_DEV_CS5530 config BLK_DEV_CS5530
tristate "Cyrix/National Semiconductor CS5530 MediaGX chipset support" tristate "Cyrix/National Semiconductor CS5530 MediaGX chipset support"
depends on X86_32 || COMPILE_TEST
select BLK_DEV_IDEDMA_PCI select BLK_DEV_IDEDMA_PCI
help help
Include support for UDMA on the Cyrix MediaGX 5530 chipset. This Include support for UDMA on the Cyrix MediaGX 5530 chipset. This
@ -435,7 +437,7 @@ config BLK_DEV_CS5530
config BLK_DEV_CS5535 config BLK_DEV_CS5535
tristate "AMD CS5535 chipset support" tristate "AMD CS5535 chipset support"
depends on X86 && !X86_64 depends on X86_32
select BLK_DEV_IDEDMA_PCI select BLK_DEV_IDEDMA_PCI
help help
Include support for UDMA on the NSC/AMD CS5535 companion chipset. Include support for UDMA on the NSC/AMD CS5535 companion chipset.
@ -486,6 +488,7 @@ config BLK_DEV_JMICRON
config BLK_DEV_SC1200 config BLK_DEV_SC1200
tristate "National SCx200 chipset support" tristate "National SCx200 chipset support"
depends on X86_32 || COMPILE_TEST
select BLK_DEV_IDEDMA_PCI select BLK_DEV_IDEDMA_PCI
help help
This driver adds support for the on-board IDE controller on the This driver adds support for the on-board IDE controller on the

8
drivers/ide/ide-probe.c
View File

@ -853,8 +853,9 @@ static int init_irq (ide_hwif_t *hwif)
if (irq_handler == NULL) if (irq_handler == NULL)
irq_handler = ide_intr; irq_handler = ide_intr;
if (request_irq(hwif->irq, irq_handler, sa, hwif->name, hwif)) if (!host->get_lock)
goto out_up; if (request_irq(hwif->irq, irq_handler, sa, hwif->name, hwif))
goto out_up;
#if !defined(__mc68000__) #if !defined(__mc68000__)
printk(KERN_INFO "%s at 0x%03lx-0x%03lx,0x%03lx on irq %d", hwif->name, printk(KERN_INFO "%s at 0x%03lx-0x%03lx,0x%03lx on irq %d", hwif->name,
@ -1533,7 +1534,8 @@ static void ide_unregister(ide_hwif_t *hwif)
ide_proc_unregister_port(hwif); ide_proc_unregister_port(hwif);
free_irq(hwif->irq, hwif); if (!hwif->host->get_lock)
free_irq(hwif->irq, hwif);
device_unregister(hwif->portdev); device_unregister(hwif->portdev);
device_unregister(&hwif->gendev); device_unregister(&hwif->gendev);