summaryrefslogtreecommitdiffstats
path: root/drivers/dma/ioat/dma.h
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2009-07-28 23:44:04 +0200
committerDan Williams <dan.j.williams@intel.com>2009-09-09 02:29:54 +0200
commit77867fff033ea549096c49d863c564ad7d8be36f (patch)
treed39bce48f29aa9ce6f23f15e73fab8333d91bc75 /drivers/dma/ioat/dma.h
parentioat: split ioat_dma_probe into core/version-specific routines (diff)
downloadlinux-77867fff033ea549096c49d863c564ad7d8be36f.tar.xz
linux-77867fff033ea549096c49d863c564ad7d8be36f.zip
ioat: fix type mismatch for ->dmacount
->dmacount tracks the sequence number of active descriptors. It is written to the DMACOUNT register to update the channel's view of pending descriptors in the chain. The register is 16-bits so ->dmacount should be unsigned and 16-bit as well. Also modify ->desccount to maintain alignment. This was never a problem in practice because we never compared dmacount values, but this is a bug waiting to happen. Signed-off-by: Maciej Sosnowski <maciej.sosnowski@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma/ioat/dma.h')
-rw-r--r--drivers/dma/ioat/dma.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/ioat/dma.h b/drivers/dma/ioat/dma.h
index 1226e35f2709..9f0c853b6a77 100644
--- a/drivers/dma/ioat/dma.h
+++ b/drivers/dma/ioat/dma.h
@@ -102,8 +102,8 @@ struct ioat_dma_chan {
struct delayed_work work;
int pending;
- int dmacount;
- int desccount;
+ u16 dmacount;
+ u16 desccount;
struct ioatdma_device *device;
struct dma_chan common;