From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat, 12 Nov 2005 17:45:45 +0000 (+0000)
Subject: [ARM] Ensure sl82c105 IDE interfaces are serialized when using DMA
X-Git-Tag: v2.6.15-rc2~108^2~8
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=a1510210c45c9af5784d64596c7025997e1add7d;p=safe%2Fjmp%2Flinux-2.6

[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>
---

diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index 6466db5..8a5c7b2 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);