diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-12-03 14:32:08 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2009-12-03 15:44:31 -0500 |
commit | 6938594374ee506e91a4c03117a034ea0ed66783 (patch) | |
tree | 619049438fd79e4e9e7025f8b6a3ebcee6e706f9 /drivers/ata | |
parent | 95514fd8ff0f30de7815950edfd84ef1e19fb1c8 (diff) |
ata_piix: fix MWDMA handling on PIIX3
Fix erroneous check for ap->udma_mask in do_pata_set_dmamode()
resulting in controller not being programmed properly for MWDMA.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/ata_piix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 9ac4e378992e..0c6155f51173 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
@@ -869,10 +869,10 @@ static void do_pata_set_dmamode(struct ata_port *ap, struct ata_device *adev, in | |||
869 | (timings[pio][1] << 8); | 869 | (timings[pio][1] << 8); |
870 | } | 870 | } |
871 | 871 | ||
872 | if (ap->udma_mask) { | 872 | if (ap->udma_mask) |
873 | udma_enable &= ~(1 << devid); | 873 | udma_enable &= ~(1 << devid); |
874 | pci_write_config_word(dev, master_port, master_data); | 874 | |
875 | } | 875 | pci_write_config_word(dev, master_port, master_data); |
876 | } | 876 | } |
877 | /* Don't scribble on 0x48 if the controller does not support UDMA */ | 877 | /* Don't scribble on 0x48 if the controller does not support UDMA */ |
878 | if (ap->udma_mask) | 878 | if (ap->udma_mask) |