diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2010-01-18 02:18:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-19 04:24:58 -0500 |
commit | 31bbb668fbe71a207d38ecd1797f4cd5b8bd710b (patch) | |
tree | d4ccfc890f700fcfff0539d46760709f24e7a0cc /drivers/ide/amd74xx.c | |
parent | d23f33de3c7fdc4bcbdd7a75d3f7b7be32caf18e (diff) |
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 @@ | |||
3 | * IDE driver for Linux. | 3 | * IDE driver for Linux. |
4 | * | 4 | * |
5 | * Copyright (c) 2000-2002 Vojtech Pavlik | 5 | * Copyright (c) 2000-2002 Vojtech Pavlik |
6 | * Copyright (c) 2007-2008 Bartlomiej Zolnierkiewicz | 6 | * Copyright (c) 2007-2010 Bartlomiej Zolnierkiewicz |
7 | * | 7 | * |
8 | * Based on the work of: | 8 | * Based on the work of: |
9 | * Andre Hedrick | 9 | * Andre Hedrick |
@@ -70,7 +70,8 @@ static void amd_set_speed(struct pci_dev *dev, u8 dn, u8 udma_mask, | |||
70 | default: return; | 70 | default: return; |
71 | } | 71 | } |
72 | 72 | ||
73 | pci_write_config_byte(dev, AMD_UDMA_TIMING + offset + (3 - dn), t); | 73 | if (timing->udma) |
74 | pci_write_config_byte(dev, AMD_UDMA_TIMING + offset + 3 - dn, t); | ||
74 | } | 75 | } |
75 | 76 | ||
76 | /* | 77 | /* |
@@ -340,6 +341,6 @@ static void __exit amd74xx_ide_exit(void) | |||
340 | module_init(amd74xx_ide_init); | 341 | module_init(amd74xx_ide_init); |
341 | module_exit(amd74xx_ide_exit); | 342 | module_exit(amd74xx_ide_exit); |
342 | 343 | ||
343 | MODULE_AUTHOR("Vojtech Pavlik"); | 344 | MODULE_AUTHOR("Vojtech Pavlik, Bartlomiej Zolnierkiewicz"); |
344 | MODULE_DESCRIPTION("AMD PCI IDE driver"); | 345 | MODULE_DESCRIPTION("AMD PCI IDE driver"); |
345 | MODULE_LICENSE("GPL"); | 346 | MODULE_LICENSE("GPL"); |