diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-11 17:54:01 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-11 17:54:01 -0400 |
commit | 0d3be723cb6432e384267d0fe83ee0bae5e17846 (patch) | |
tree | 7b2aba9d5d592540eaf2f7c9394209ac10ce5db4 /drivers/ide | |
parent | 90986028c98be10807bb6f48e883f33fa20e5499 (diff) |
sis5513: don't change UDMA settings when programming PIO
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | 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 7455bf357ed9..3a8cb1468a76 100644 --- a/drivers/ide/pci/sis5513.c +++ b/drivers/ide/pci/sis5513.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/drivers/ide/pci/sis5513.c Version 0.26 Jul 7, 2007 | 2 | * linux/drivers/ide/pci/sis5513.c Version 0.27 Jul 14, 2007 |
3 | * | 3 | * |
4 | * Copyright (C) 1999-2000 Andre Hedrick <andre@linux-ide.org> | 4 | * Copyright (C) 1999-2000 Andre Hedrick <andre@linux-ide.org> |
5 | * Copyright (C) 2002 Lionel Bouton <Lionel.Bouton@inet6.fr>, Maintainer | 5 | * Copyright (C) 2002 Lionel Bouton <Lionel.Bouton@inet6.fr>, Maintainer |
@@ -537,6 +537,9 @@ static int sis5513_tune_chipset(ide_drive_t *drive, const u8 speed) | |||
537 | u32 regdw; | 537 | u32 regdw; |
538 | u8 drive_pci, reg; | 538 | u8 drive_pci, reg; |
539 | 539 | ||
540 | if (speed >= XFER_PIO_0 && speed <= XFER_PIO_4) | ||
541 | return sis5513_tune_drive(drive, speed - XFER_PIO_0); | ||
542 | |||
540 | /* See config_art_rwp_pio for drive pci config registers */ | 543 | /* See config_art_rwp_pio for drive pci config registers */ |
541 | drive_pci = 0x40; | 544 | drive_pci = 0x40; |
542 | if (chipset_family >= ATA_133) { | 545 | if (chipset_family >= ATA_133) { |
@@ -601,12 +604,6 @@ static int sis5513_tune_chipset(ide_drive_t *drive, const u8 speed) | |||
601 | case XFER_SW_DMA_1: | 604 | case XFER_SW_DMA_1: |
602 | case XFER_SW_DMA_0: | 605 | case XFER_SW_DMA_0: |
603 | break; | 606 | break; |
604 | case XFER_PIO_4: | ||
605 | case XFER_PIO_3: | ||
606 | case XFER_PIO_2: | ||
607 | case XFER_PIO_1: | ||
608 | case XFER_PIO_0: | ||
609 | return sis5513_tune_drive(drive, speed - XFER_PIO_0); | ||
610 | default: | 607 | default: |
611 | BUG(); | 608 | BUG(); |
612 | break; | 609 | break; |