Commit 47b32049 authored by Reimar Döffinger's avatar Reimar Döffinger Committed by Damien Le Moal
Browse files

pata_ali: fix checking of DMA state 



Checking if DMA is enabled should be done via the
ata_dma_enabled helper function, since the init state
0xff indicates disabled.
Change based on code review, not tested due to lack of hardware.

Signed-off-by: default avatarReimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
parent 6ac586f2

drivers/ata/pata_ali.c

+2 −2
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static void ali_set_piomode(struct ata_port *ap, struct ata_device *adev) 
		struct ata_timing p;

		ata_timing_compute(pair, pair->pio_mode, &p, T, 1);

		ata_timing_merge(&p, &t, &t, ATA_TIMING_SETUP|ATA_TIMING_8BIT);

		if (pair->dma_mode) {

		if (ata_dma_enabled(pair)) {

			ata_timing_compute(pair, pair->dma_mode, &p, T, 1);

			ata_timing_merge(&p, &t, &t, ATA_TIMING_SETUP|ATA_TIMING_8BIT);

		}
@@ -264,7 +264,7 @@ static void ali_set_dmamode(struct ata_port *ap, struct ata_device *adev) 
			struct ata_timing p;

			ata_timing_compute(pair, pair->pio_mode, &p, T, 1);

			ata_timing_merge(&p, &t, &t, ATA_TIMING_SETUP|ATA_TIMING_8BIT);

			if (pair->dma_mode) {

			if (ata_dma_enabled(pair)) {

				ata_timing_compute(pair, pair->dma_mode, &p, T, 1);

				ata_timing_merge(&p, &t, &t, ATA_TIMING_SETUP|ATA_TIMING_8BIT);

			}