diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 09:31:03 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 09:31:03 -0400 |
| commit | 77dd3b3bd23111040c504be6bd873a5ad09f02df (patch) | |
| tree | 119ddcdf89d6a593a8fefea530249084559eeb44 /drivers/ata/pata_oldpiix.c | |
| parent | 916c7a855174e3b53d182b97a26b2e27a29726a1 (diff) | |
| parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 (diff) | |
Merge branch 'linus' into timers/ntp
Diffstat (limited to 'drivers/ata/pata_oldpiix.c')
| -rw-r--r-- | drivers/ata/pata_oldpiix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c index e678af383d13..df64f2443001 100644 --- a/drivers/ata/pata_oldpiix.c +++ b/drivers/ata/pata_oldpiix.c | |||
| @@ -198,7 +198,7 @@ static unsigned int oldpiix_qc_issue(struct ata_queued_cmd *qc) | |||
| 198 | 198 | ||
| 199 | if (adev != ap->private_data) { | 199 | if (adev != ap->private_data) { |
| 200 | oldpiix_set_piomode(ap, adev); | 200 | oldpiix_set_piomode(ap, adev); |
| 201 | if (adev->dma_mode) | 201 | if (ata_dma_enabled(adev)) |
| 202 | oldpiix_set_dmamode(ap, adev); | 202 | oldpiix_set_dmamode(ap, adev); |
| 203 | } | 203 | } |
| 204 | return ata_sff_qc_issue(qc); | 204 | return ata_sff_qc_issue(qc); |