From ab9c3406cbe4fd2ba71adbb3b8d97063af785a08 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 17 Jul 2008 17:59:56 -0700 Subject: [PATCH] --- yaml --- r: 105071 b: refs/heads/master c: 0839875e0c197ded56bbae820e699f26d6fa2697 h: refs/heads/master i: 105069: 87c7da5d45f43be56835cf60fea1ec76cc7f8ff7 105067: bceac40df0f5eb7c5012995187b46e81acc0fe73 105063: 56850d354b30727f2699ebac2471f20eb7823d81 105055: 2adbe942430bb3e496bef3a8e248e1e66e779b42 v: v3 --- [refs] | 2 +- trunk/include/linux/dmaengine.h | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ecf01a7b88f7..e99bc37fdbb3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3dce01713723bbcc92562bd4488e8b840a4f786c +refs/heads/master: 0839875e0c197ded56bbae820e699f26d6fa2697 diff --git a/trunk/include/linux/dmaengine.h b/trunk/include/linux/dmaengine.h index 9b91d341e1fa..adb0b084eb5a 100644 --- a/trunk/include/linux/dmaengine.h +++ b/trunk/include/linux/dmaengine.h @@ -375,16 +375,14 @@ dma_cookie_t dma_async_memcpy_pg_to_pg(struct dma_chan *chan, void dma_async_tx_descriptor_init(struct dma_async_tx_descriptor *tx, struct dma_chan *chan); -static inline void -async_tx_ack(struct dma_async_tx_descriptor *tx) +static inline void async_tx_ack(struct dma_async_tx_descriptor *tx) { tx->flags |= DMA_CTRL_ACK; } -static inline int -async_tx_test_ack(struct dma_async_tx_descriptor *tx) +static inline bool async_tx_test_ack(struct dma_async_tx_descriptor *tx) { - return tx->flags & DMA_CTRL_ACK; + return (tx->flags & DMA_CTRL_ACK) == DMA_CTRL_ACK; } #define first_dma_cap(mask) __first_dma_cap(&(mask))