projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into sched/devel
[cascardo/linux.git]
/
drivers
/
ata
/
pata_cs5530.c
diff --git
a/drivers/ata/pata_cs5530.c
b/drivers/ata/pata_cs5530.c
index
744beeb
..
0c4b271
100644
(file)
--- a/
drivers/ata/pata_cs5530.c
+++ b/
drivers/ata/pata_cs5530.c
@@
-149,10
+149,10
@@
static unsigned int cs5530_qc_issue(struct ata_queued_cmd *qc)
struct ata_device *prev = ap->private_data;
/* See if the DMA settings could be wrong */
struct ata_device *prev = ap->private_data;
/* See if the DMA settings could be wrong */
- if (a
dev->dma_mode != 0
&& adev != prev && prev != NULL) {
+ if (a
ta_dma_enabled(adev)
&& adev != prev && prev != NULL) {
/* Maybe, but do the channels match MWDMA/UDMA ? */
/* Maybe, but do the channels match MWDMA/UDMA ? */
- if ((a
dev->dma_mode >= XFER_UDMA_0 && prev->dma_mode < XFER_UDMA_0
) ||
- (a
dev->dma_mode < XFER_UDMA_0 && prev->dma_mode >= XFER_UDMA_0
))
+ if ((a
ta_using_udma(adev) && !ata_using_udma(prev)
) ||
+ (a
ta_using_udma(prev) && !ata_using_udma(adev)
))
/* Switch the mode bits */
cs5530_set_dmamode(ap, adev);
}
/* Switch the mode bits */
cs5530_set_dmamode(ap, adev);
}