diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-12-03 14:32:13 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2009-12-03 16:13:39 -0500 |
commit | c4d8a20022e617174eb887c82356d3f513e279a7 (patch) | |
tree | adf51416fffec4e097fea4743bd94853f30f4079 /drivers/ata/pata_via.c | |
parent | 750c7136ea873255ed0b74e20f0d3ef9ac8984c0 (diff) |
pata_via: clear UDMA transfer mode bit for PIO and MWDMA
Fix register naming while at it.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/pata_via.c')
-rw-r--r-- | drivers/ata/pata_via.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c index 78eac276effb..0d97890af681 100644 --- a/drivers/ata/pata_via.c +++ b/drivers/ata/pata_via.c | |||
@@ -303,14 +303,21 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo | |||
303 | } | 303 | } |
304 | 304 | ||
305 | /* Set UDMA unless device is not UDMA capable */ | 305 | /* Set UDMA unless device is not UDMA capable */ |
306 | if (udma_type && t.udma) { | 306 | if (udma_type) { |
307 | u8 cable80_status; | 307 | u8 udma_etc; |
308 | 308 | ||
309 | /* Get 80-wire cable detection bit */ | 309 | pci_read_config_byte(pdev, 0x50 + offset, &udma_etc); |
310 | pci_read_config_byte(pdev, 0x50 + offset, &cable80_status); | ||
311 | cable80_status &= 0x10; | ||
312 | 310 | ||
313 | pci_write_config_byte(pdev, 0x50 + offset, ut | cable80_status); | 311 | /* clear transfer mode bit */ |
312 | udma_etc &= ~0x20; | ||
313 | |||
314 | if (t.udma) { | ||
315 | /* preserve 80-wire cable detection bit */ | ||
316 | udma_etc &= 0x10; | ||
317 | udma_etc |= ut; | ||
318 | } | ||
319 | |||
320 | pci_write_config_byte(pdev, 0x50 + offset, udma_etc); | ||
314 | } | 321 | } |
315 | } | 322 | } |
316 | 323 | ||