Skip to content

Commit

Permalink
sis5513: don't change UDMA settings when programming PIO
Browse files Browse the repository at this point in the history
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Oct 11, 2007
1 parent 9098602 commit 0d3be72
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions drivers/ide/pci/sis5513.c
Original file line number Diff line number Diff line change
@@ -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 <andre@linux-ide.org>
* Copyright (C) 2002 Lionel Bouton <Lionel.Bouton@inet6.fr>, Maintainer
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 0d3be72

Please sign in to comment.