Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0d3be723cb6432e384267d0fe83ee0bae5e17846
Commit: 0d3be723cb6432e384267d0fe83ee0bae5e17846
Parent: 90986028c98be10807bb6f48e883f33fa20e5499
Author: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
AuthorDate: Thu Oct 11 23:54:01 2007 +0200
Committer: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
CommitDate: Thu Oct 11 23:54:01 2007 +0200
sis5513: don't change UDMA settings when programming PIO
Acked-by: Sergei Shtylyov <[EMAIL PROTECTED]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
---
drivers/ide/pci/sis5513.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index 7455bf3..3a8cb14 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -1,5 +1,5 @@
/*
- * linux/drivers/ide/pci/sis5513.c Version 0.26 Jul 7, 2007
+ * linux/drivers/ide/pci/sis5513.c Version 0.27 Jul 14, 2007
*
* Copyright (C) 1999-2000 Andre Hedrick <[EMAIL PROTECTED]>
* Copyright (C) 2002 Lionel Bouton <[EMAIL PROTECTED]>, Maintainer
@@ -537,6 +537,9 @@ static int sis5513_tune_chipset(ide_drive_t *drive, const
u8 speed)
u32 regdw;
u8 drive_pci, reg;
+ if (speed >= XFER_PIO_0 && speed <= XFER_PIO_4)
+ return sis5513_tune_drive(drive, speed - XFER_PIO_0);
+
/* See config_art_rwp_pio for drive pci config registers */
drive_pci = 0x40;
if (chipset_family >= ATA_133) {
@@ -601,12 +604,6 @@ static int sis5513_tune_chipset(ide_drive_t *drive, const
u8 speed)
case XFER_SW_DMA_1:
case XFER_SW_DMA_0:
break;
- case XFER_PIO_4:
- case XFER_PIO_3:
- case XFER_PIO_2:
- case XFER_PIO_1:
- case XFER_PIO_0:
- return sis5513_tune_drive(drive, speed - XFER_PIO_0);
default:
BUG();
break;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
