From acdc0421e2ce63811bb115c4298effce659cc7df Mon Sep 17 00:00:00 2001 From: Bart Hartgers Date: Sun, 17 Jan 2010 00:56:54 +0100 Subject: [PATCH] --- yaml --- r: 183159 b: refs/heads/master c: 02d1d6160ffe13f4ebc6f85f72366a5da0b1fb9b h: refs/heads/master i: 183157: 27bb1477dd3381ab89019c70869f2565f4f357e7 183155: fe3ebcc226cfbaed8241a361918268e573ae63ef 183151: 626624b87e3b06967056bf663b947196718805ac v: v3 --- [refs] | 2 +- trunk/drivers/ata/sata_via.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a7c166132db5..d213340f1b61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ffc5da5e1e57592da9c22d83a98c63afc8d985c +refs/heads/master: 02d1d6160ffe13f4ebc6f85f72366a5da0b1fb9b diff --git a/trunk/drivers/ata/sata_via.c b/trunk/drivers/ata/sata_via.c index 02efd9a83d26..2a17fa375164 100644 --- a/trunk/drivers/ata/sata_via.c +++ b/trunk/drivers/ata/sata_via.c @@ -44,7 +44,7 @@ #include #define DRV_NAME "sata_via" -#define DRV_VERSION "2.4" +#define DRV_VERSION "2.5" /* * vt8251 is different from other sata controllers of VIA. It has two @@ -392,14 +392,16 @@ static void vt6421_set_pio_mode(struct ata_port *ap, struct ata_device *adev) { struct pci_dev *pdev = to_pci_dev(ap->host->dev); static const u8 pio_bits[] = { 0xA8, 0x65, 0x65, 0x31, 0x20 }; - pci_write_config_byte(pdev, PATA_PIO_TIMING, pio_bits[adev->pio_mode - XFER_PIO_0]); + pci_write_config_byte(pdev, PATA_PIO_TIMING - adev->devno, + pio_bits[adev->pio_mode - XFER_PIO_0]); } static void vt6421_set_dma_mode(struct ata_port *ap, struct ata_device *adev) { struct pci_dev *pdev = to_pci_dev(ap->host->dev); static const u8 udma_bits[] = { 0xEE, 0xE8, 0xE6, 0xE4, 0xE2, 0xE1, 0xE0, 0xE0 }; - pci_write_config_byte(pdev, PATA_UDMA_TIMING, udma_bits[adev->dma_mode - XFER_UDMA_0]); + pci_write_config_byte(pdev, PATA_UDMA_TIMING - adev->devno, + udma_bits[adev->dma_mode - XFER_UDMA_0]); } static const unsigned int svia_bar_sizes[] = {