Commit 039aa4d6 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Thierry Reding

soc/tegra: Watch wait_for_completion_timeout() return type

The return type of the wait_for_completion_timeout() function is not int
but unsigned long. An appropriately named unsigned long is added and the
assignment fixed up.
Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent b787f68c
...@@ -59,6 +59,7 @@ static u32 tegra20_fuse_readl(const unsigned int offset) ...@@ -59,6 +59,7 @@ static u32 tegra20_fuse_readl(const unsigned int offset)
int ret; int ret;
u32 val = 0; u32 val = 0;
struct dma_async_tx_descriptor *dma_desc; struct dma_async_tx_descriptor *dma_desc;
unsigned long time_left;
mutex_lock(&apb_dma_lock); mutex_lock(&apb_dma_lock);
...@@ -82,9 +83,10 @@ static u32 tegra20_fuse_readl(const unsigned int offset) ...@@ -82,9 +83,10 @@ static u32 tegra20_fuse_readl(const unsigned int offset)
dmaengine_submit(dma_desc); dmaengine_submit(dma_desc);
dma_async_issue_pending(apb_dma_chan); dma_async_issue_pending(apb_dma_chan);
ret = wait_for_completion_timeout(&apb_dma_wait, msecs_to_jiffies(50)); time_left = wait_for_completion_timeout(&apb_dma_wait,
msecs_to_jiffies(50));
if (WARN(ret == 0, "apb read dma timed out")) if (WARN(time_left == 0, "apb read dma timed out"))
dmaengine_terminate_all(apb_dma_chan); dmaengine_terminate_all(apb_dma_chan);
else else
val = *apb_buffer; val = *apb_buffer;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment