From 50259e1ef2bfc2e9ca4e0905a899e3d46277cfc2 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Sun, 2 Dec 2007 03:47:01 +0100 Subject: [PATCH] --- yaml --- r: 74571 b: refs/heads/master c: 943547abdfe9b4e27e36a25987909619908dffbf h: refs/heads/master i: 74569: f9b1acf22dbb26f9795880791ceee7f1276d56af 74567: 40d392066f757bcfa761fe55585a17ac814114b6 v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_amd.c | 5 +++-- trunk/drivers/ata/pata_via.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 41d76018488e..99f9a3aa567d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ba8695870a5a2ebf6f3d1ee3ac1e4d96d667cf6 +refs/heads/master: 943547abdfe9b4e27e36a25987909619908dffbf diff --git a/trunk/drivers/ata/pata_amd.c b/trunk/drivers/ata/pata_amd.c index c5779ad4abca..3cc27b514654 100644 --- a/trunk/drivers/ata/pata_amd.c +++ b/trunk/drivers/ata/pata_amd.c @@ -25,7 +25,7 @@ #include #define DRV_NAME "pata_amd" -#define DRV_VERSION "0.3.9" +#define DRV_VERSION "0.3.10" /** * timing_setup - shared timing computation and load @@ -115,7 +115,8 @@ static void timing_setup(struct ata_port *ap, struct ata_device *adev, int offse } /* UDMA timing */ - pci_write_config_byte(pdev, offset + 0x10 + (3 - dn), t); + if (at.udma) + pci_write_config_byte(pdev, offset + 0x10 + (3 - dn), t); } /** diff --git a/trunk/drivers/ata/pata_via.c b/trunk/drivers/ata/pata_via.c index a4175fbdd170..453d72bf2598 100644 --- a/trunk/drivers/ata/pata_via.c +++ b/trunk/drivers/ata/pata_via.c @@ -63,7 +63,7 @@ #include #define DRV_NAME "pata_via" -#define DRV_VERSION "0.3.2" +#define DRV_VERSION "0.3.3" /* * The following comes directly from Vojtech Pavlik's ide/pci/via82cxxx @@ -296,7 +296,7 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo } /* Set UDMA unless device is not UDMA capable */ - if (udma_type) { + if (udma_type && t.udma) { u8 cable80_status; /* Get 80-wire cable detection bit */