Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 105071
b: refs/heads/master
c: 0839875
h: refs/heads/master
i:
  105069: 87c7da5
  105067: bceac40
  105063: 56850d3
  105055: 2adbe94
v: v3
  • Loading branch information
Dan Williams committed Jul 18, 2008
1 parent 35f95a9 commit ab9c340
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3dce01713723bbcc92562bd4488e8b840a4f786c
refs/heads/master: 0839875e0c197ded56bbae820e699f26d6fa2697
8 changes: 3 additions & 5 deletions trunk/include/linux/dmaengine.h
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit ab9c340

Please sign in to comment.