From 0c3610445f09210e1654eb5d542f163b6b89940c Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Thu, 11 Oct 2007 23:54:01 +0200
Subject: [PATCH] --- yaml --- r: 66129 b: refs/heads/master c:
 326d72f437b0a9216290ad8f10817e1e363fd813 h: refs/heads/master i:   66127:
 0572cce958a125a371fa763356ac0f173a9f4759 v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/ide/pci/cs5520.c | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index dce8cbfe7a6b..f452f09c8d53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fabe1510568acd5194f630dbbcf77a34610d7e9e
+refs/heads/master: 326d72f437b0a9216290ad8f10817e1e363fd813
diff --git a/trunk/drivers/ide/pci/cs5520.c b/trunk/drivers/ide/pci/cs5520.c
index a73c318ff086..e6af534a7190 100644
--- a/trunk/drivers/ide/pci/cs5520.c
+++ b/trunk/drivers/ide/pci/cs5520.c
@@ -73,7 +73,6 @@ static int cs5520_tune_chipset(ide_drive_t *drive, const u8 speed)
 	int pio = speed;
 	u8 reg;
 	int controller = drive->dn > 1 ? 1 : 0;
-	int error;
 
 	switch(speed)
 	{
@@ -114,14 +113,9 @@ static int cs5520_tune_chipset(ide_drive_t *drive, const u8 speed)
 	reg = inb(hwif->dma_base + 0x02 + 8*controller);
 	reg |= 1<<((drive->dn&1)+5);
 	outb(reg, hwif->dma_base + 0x02 + 8*controller);
-		
-	error = ide_config_drive_speed(drive, speed);
-	/* ATAPI is harder so leave it for now */
-	if(!error && drive->media == ide_disk)
-		error = hwif->ide_dma_on(drive);
 
-	return error;
-}	
+	return ide_config_drive_speed(drive, speed);
+}
 
 static void cs5520_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
@@ -177,7 +171,8 @@ static void __devinit init_hwif_cs5520(ide_hwif_t *hwif)
 		hwif->drives[1].autotune = 1;
 		return;
 	}
-	
+
+	/* ATAPI is harder so leave it for now */
 	hwif->atapi_dma = 0;
 	hwif->ultra_mask = 0;
 	hwif->swdma_mask = 0;