aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan <alan@lxorguk.ukuu.org.uk>2007-02-20 12:47:37 -0500
committerJeff Garzik <jeff@garzik.org>2007-02-21 04:58:20 -0500
commitb7939b14d8dd9cb4a3ebfaea1416695e4b6d4a42 (patch)
tree6f7774fc306fe414243975da61c568c187178a5c
parent3ddcc591e3501e49037f9ace9340697a9a414a5e (diff)
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>
-rw-r--r--drivers/ata/pata_oldpiix.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index 45215aa05e72..2389107a2006 100644
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -25,7 +25,7 @@
25#include <linux/ata.h> 25#include <linux/ata.h>
26 26
27#define DRV_NAME "pata_oldpiix" 27#define DRV_NAME "pata_oldpiix"
28#define DRV_VERSION "0.5.3" 28#define DRV_VERSION "0.5.4"
29 29
30/** 30/**
31 * oldpiix_pre_reset - probe begin 31 * oldpiix_pre_reset - probe begin
@@ -209,10 +209,9 @@ static unsigned int oldpiix_qc_issue_prot(struct ata_queued_cmd *qc)
209 struct ata_device *adev = qc->dev; 209 struct ata_device *adev = qc->dev;
210 210
211 if (adev != ap->private_data) { 211 if (adev != ap->private_data) {
212 oldpiix_set_piomode(ap, adev);
212 if (adev->dma_mode) 213 if (adev->dma_mode)
213 oldpiix_set_dmamode(ap, adev); 214 oldpiix_set_dmamode(ap, adev);
214 else if (adev->pio_mode)
215 oldpiix_set_piomode(ap, adev);
216 } 215 }
217 return ata_qc_issue_prot(qc); 216 return ata_qc_issue_prot(qc);
218} 217}