|
@@ -853,8 +853,9 @@ static int init_irq (ide_hwif_t *hwif)
|
|
|
if (irq_handler == NULL)
|
|
|
irq_handler = ide_intr;
|
|
|
|
|
|
- if (request_irq(hwif->irq, irq_handler, sa, hwif->name, hwif))
|
|
|
- goto out_up;
|
|
|
+ if (!host->get_lock)
|
|
|
+ if (request_irq(hwif->irq, irq_handler, sa, hwif->name, hwif))
|
|
|
+ goto out_up;
|
|
|
|
|
|
#if !defined(__mc68000__)
|
|
|
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);
|
|
|
|
|
|
- free_irq(hwif->irq, hwif);
|
|
|
+ if (!hwif->host->get_lock)
|
|
|
+ free_irq(hwif->irq, hwif);
|
|
|
|
|
|
device_unregister(hwif->portdev);
|
|
|
device_unregister(&hwif->gendev);
|