summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRussell King - ARM Linux <linux@arm.linux.org.uk>2011-01-01 23:00:23 +0000
committerDan Williams <dan.j.williams@intel.com>2011-01-14 17:07:49 -0800
commit98d530fe246b65fbd3cdeeeca319a80c46cb4793 (patch)
treef5b6d711fd6d24ae6a042e91c4bc9108914fb382 /include
parentdda36f9821321edf65d69da5c0807df7e73d26fc (diff)
downloadlinux-3.10-98d530fe246b65fbd3cdeeeca319a80c46cb4793.tar.gz
linux-3.10-98d530fe246b65fbd3cdeeeca319a80c46cb4793.tar.bz2
linux-3.10-98d530fe246b65fbd3cdeeeca319a80c46cb4793.zip
Fix dmaengine_submit() return type
desc->tx_submit's return type is dma_cookie_t, not int. Therefore, dmaengine_submit() should match this return type as it's just wrapping this detail. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/dmaengine.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 9d8688b92d8..830935b7c49 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -532,7 +532,7 @@ static inline int dmaengine_resume(struct dma_chan *chan)
return dmaengine_device_control(chan, DMA_RESUME, 0);
}
-static inline int dmaengine_submit(struct dma_async_tx_descriptor *desc)
+static inline dma_cookie_t dmaengine_submit(struct dma_async_tx_descriptor *desc)
{
return desc->tx_submit(desc);
}