From a002c3ea4f97e0bc6a5ab5e47d01b280024b870d Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sat, 13 Oct 2007 17:47:53 +0200
Subject: [PATCH] --- yaml --- r: 68571 b: refs/heads/master c:
 88ae4d8c3829fe3d7be9b1e3ed79a37814752d61 h: refs/heads/master i:   68569:
 d1fe54899da624fbca481df8f80a35f43bb8d633   68567:
 5877719494ba136d08720fbf4c05517fb3557767 v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/ide/pci/sc1200.c | 24 ++++++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index ebbf636882a9..8423667deced 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfb2311226539e0496c0a7c65ceebaaff2120a0b
+refs/heads/master: 88ae4d8c3829fe3d7be9b1e3ed79a37814752d61
diff --git a/trunk/drivers/ide/pci/sc1200.c b/trunk/drivers/ide/pci/sc1200.c
index 76f0868054a1..ee0e3f554d9a 100644
--- a/trunk/drivers/ide/pci/sc1200.c
+++ b/trunk/drivers/ide/pci/sc1200.c
@@ -378,16 +378,20 @@ static void __devinit init_hwif_sc1200 (ide_hwif_t *hwif)
 	if (hwif->mate)
 		hwif->serialized = hwif->mate->serialized = 1;
 	hwif->autodma = 0;
-	if (hwif->dma_base) {
-		hwif->udma_filter = sc1200_udma_filter;
-		hwif->ide_dma_check = &sc1200_config_dma;
-		hwif->ide_dma_end   = &sc1200_ide_dma_end;
-        	if (!noautodma)
-                	hwif->autodma = 1;
-
-		hwif->set_pio_mode = &sc1200_set_pio_mode;
-		hwif->set_dma_mode = &sc1200_set_dma_mode;
-	}
+
+	hwif->set_pio_mode = &sc1200_set_pio_mode;
+	hwif->set_dma_mode = &sc1200_set_dma_mode;
+
+	if (hwif->dma_base == 0)
+		return;
+
+	hwif->udma_filter = sc1200_udma_filter;
+	hwif->ide_dma_check = &sc1200_config_dma;
+	hwif->ide_dma_end   = &sc1200_ide_dma_end;
+
+	if (!noautodma)
+		hwif->autodma = 1;
+
         hwif->atapi_dma = 1;
         hwif->ultra_mask = 0x07;
         hwif->mwdma_mask = 0x07;