diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 14:30:47 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 14:30:47 -0500 |
| commit | ab1127823b757ec945a048c3385eb1f99a459823 (patch) | |
| tree | 80bc28b5d6b4f1091f82da3d631200dd982b20b9 /include/linux | |
| parent | 365bbe0d0caaf2ba74d56556827babf0bc66965d (diff) | |
| parent | e93f09dc2d49d8e98818a93ad17f3ede91533738 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
sata_mv HighPoint 2310 support (88SX7042)
libata: fix handling of port actions in per-dev action mask
libata: initialize qc->dma_dir to DMA_NONE
sata_via: add PCI ID 0x5337
libata doc: "error : unterminated entity reference exceptions"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/libata.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index ab275483032..e53a13ba7f7 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -1143,6 +1143,7 @@ static inline void ata_tf_init(struct ata_device *dev, struct ata_taskfile *tf) | |||
| 1143 | 1143 | ||
| 1144 | static inline void ata_qc_reinit(struct ata_queued_cmd *qc) | 1144 | static inline void ata_qc_reinit(struct ata_queued_cmd *qc) |
| 1145 | { | 1145 | { |
| 1146 | qc->dma_dir = DMA_NONE; | ||
| 1146 | qc->__sg = NULL; | 1147 | qc->__sg = NULL; |
| 1147 | qc->flags = 0; | 1148 | qc->flags = 0; |
| 1148 | qc->cursect = qc->cursg = qc->cursg_ofs = 0; | 1149 | qc->cursect = qc->cursg = qc->cursg_ofs = 0; |