summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-11-12 17:45:45 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-11-12 17:45:45 +0000
commita1510210c45c9af5784d64596c7025997e1add7d (patch)
tree74e6e944ec26b62a61c159934f4425604c57123d
parentda2660d2c40496b1699c4de652f6d0cfd13937c0 (diff)
[ARM] Ensure sl82c105 IDE interfaces are serialized when using DMA
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>
-rw-r--r--drivers/ide/pci/sl82c105.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index 6466db5f0170..8a5c7b286b2b 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -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);