Commit 61666547 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Linus Torvalds

[PATCH] fix IDE irq disable logic

Since the IO-APIC irq disable fix went in we can now enable
the proper IRQ disabling in the IDE driver again. That had
been disabled due to the problems with UP IO-APIC.
parent a6b44dfe
...@@ -949,14 +949,14 @@ void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq) ...@@ -949,14 +949,14 @@ void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq)
* happens anyway when any interrupt comes in, IDE or otherwise * happens anyway when any interrupt comes in, IDE or otherwise
* -- the kernel masks the IRQ while it is being handled. * -- the kernel masks the IRQ while it is being handled.
*/ */
if (masked_irq != IDE_NO_IRQ && hwif->irq != masked_irq) if (hwif->irq != masked_irq)
disable_irq_nosync(hwif->irq); disable_irq_nosync(hwif->irq);
spin_unlock(&ide_lock); spin_unlock(&ide_lock);
local_irq_enable(); local_irq_enable();
/* allow other IRQs while we start this request */ /* allow other IRQs while we start this request */
startstop = start_request(drive, rq); startstop = start_request(drive, rq);
spin_lock_irq(&ide_lock); spin_lock_irq(&ide_lock);
if (masked_irq != IDE_NO_IRQ && hwif->irq != masked_irq) if (hwif->irq != masked_irq)
enable_irq(hwif->irq); enable_irq(hwif->irq);
if (startstop == ide_released) if (startstop == ide_released)
goto queue_next; goto queue_next;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment