diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2010-01-18 08:18:17 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-19 10:24:58 +0100 |
| commit | 31bbb668fbe71a207d38ecd1797f4cd5b8bd710b (patch) | |
| tree | d4ccfc890f700fcfff0539d46760709f24e7a0cc /drivers/ide/amd74xx.c | |
| parent | alim15x3: cleanup ali_cable_detect() (diff) | |
| download | linux-31bbb668fbe71a207d38ecd1797f4cd5b8bd710b.tar.xz linux-31bbb668fbe71a207d38ecd1797f4cd5b8bd710b.zip | |
amd74xx: don't change UDMA settings when programming PIO timings
Based on libata pata_amd host driver.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide/amd74xx.c')
| -rw-r--r-- | drivers/ide/amd74xx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ide/amd74xx.c b/drivers/ide/amd74xx.c index 628cd2e5fed8..108e9b676859 100644 --- a/drivers/ide/amd74xx.c +++ b/drivers/ide/amd74xx.c @@ -3,7 +3,7 @@ * IDE driver for Linux. * * Copyright (c) 2000-2002 Vojtech Pavlik - * Copyright (c) 2007-2008 Bartlomiej Zolnierkiewicz + * Copyright (c) 2007-2010 Bartlomiej Zolnierkiewicz * * Based on the work of: * Andre Hedrick @@ -70,7 +70,8 @@ static void amd_set_speed(struct pci_dev *dev, u8 dn, u8 udma_mask, default: return; } - pci_write_config_byte(dev, AMD_UDMA_TIMING + offset + (3 - dn), t); + if (timing->udma) + pci_write_config_byte(dev, AMD_UDMA_TIMING + offset + 3 - dn, t); } /* @@ -340,6 +341,6 @@ static void __exit amd74xx_ide_exit(void) module_init(amd74xx_ide_init); module_exit(amd74xx_ide_exit); -MODULE_AUTHOR("Vojtech Pavlik"); +MODULE_AUTHOR("Vojtech Pavlik, Bartlomiej Zolnierkiewicz"); MODULE_DESCRIPTION("AMD PCI IDE driver"); MODULE_LICENSE("GPL"); |