Skip to content

Commit

Permalink
dmaengine: Revert "dmaengine: add verification of DMA_INTERRUPT capab…
Browse files Browse the repository at this point in the history
…ility for dmatest"

This reverts commit a8facc7 ("dmaengine: add verification of
DMA_INTERRUPT capability for dmatest") as it causes regression due to
the fact that DMA_INTERRUPT in linked to dma_prep_interrupt() so
checking that is incorrect here

Signed-off-by: Vinod Koul <vkoul@kernel.org>
Link: https://lore.kernel.org/r/20220606174906.3979283-1-vkoul@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
  • Loading branch information
Vinod Koul committed Jun 9, 2022
1 parent 615a4bf commit 646728d
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions drivers/dma/dmatest.c
Original file line number Diff line number Diff line change
Expand Up @@ -675,16 +675,10 @@ static int dmatest_func(void *data)
/*
* src and dst buffers are freed by ourselves below
*/
if (params->polled) {
if (params->polled)
flags = DMA_CTRL_ACK;
} else {
if (dma_has_cap(DMA_INTERRUPT, dev->cap_mask)) {
flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT;
} else {
pr_err("Channel does not support interrupt!\n");
goto err_pq_array;
}
}
else
flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT;

ktime = ktime_get();
while (!(kthread_should_stop() ||
Expand Down Expand Up @@ -912,7 +906,6 @@ static int dmatest_func(void *data)
runtime = ktime_to_us(ktime);

ret = 0;
err_pq_array:
kfree(dma_pq);
err_srcs_array:
kfree(srcs);
Expand Down

0 comments on commit 646728d

Please sign in to comment.