From: Alan <alan@lxorguk.ukuu.org.uk>
Date: Tue, 20 Feb 2007 17:47:37 +0000 (+0000)
Subject: pata_oldpiix: Call both PIO and DMA setup functions on switch as they are called... 
X-Git-Tag: v2.6.21-rc2~25^2~22
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b7939b14d8dd9cb4a3ebfaea1416695e4b6d4a42;p=~emulex%2Finfiniband.git

pata_oldpiix: Call both PIO and DMA setup functions on switch as they are called on set up

Keeps the behaviour consistent and easier to understand.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index 45215aa05e7..2389107a200 100644
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -25,7 +25,7 @@
 #include <linux/ata.h>
 
 #define DRV_NAME	"pata_oldpiix"
-#define DRV_VERSION	"0.5.3"
+#define DRV_VERSION	"0.5.4"
 
 /**
  *	oldpiix_pre_reset		-	probe begin
@@ -209,10 +209,9 @@ static unsigned int oldpiix_qc_issue_prot(struct ata_queued_cmd *qc)
 	struct ata_device *adev = qc->dev;
 
 	if (adev != ap->private_data) {
+		oldpiix_set_piomode(ap, adev);
 		if (adev->dma_mode)
 			oldpiix_set_dmamode(ap, adev);
-		else if (adev->pio_mode)
-			oldpiix_set_piomode(ap, adev);
 	}
 	return ata_qc_issue_prot(qc);
 }