]> err.no Git - linux-2.6/commitdiff
[ARM] Ensure sl82c105 IDE interfaces are serialized when using DMA
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 12 Nov 2005 17:45:45 +0000 (17:45 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 Nov 2005 17:45:45 +0000 (17:45 +0000)
We don't want to reset the DMA state machine while the other
channel is in use.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
drivers/ide/pci/sl82c105.c

index 6466db5f01702533d68c0f253a37c9071488957d..8a5c7b286b2b86dbf5d0e9c9c00ed8ef134541d4 100644 (file)
@@ -465,6 +465,9 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
                        hwif->autodma = 1;
                hwif->drives[0].autodma = hwif->autodma;
                hwif->drives[1].autodma = hwif->autodma;
+
+               if (hwif->mate)
+                       hwif->serialized = hwif->mate->serialized = 1;
 #endif /* CONFIG_BLK_DEV_IDEDMA */
        }
        hwif->OUTB(dma_state, hwif->dma_base + 2);