diff options
author | Nicholas Mc Guire <hofrat@osadl.org> | 2015-03-09 03:12:26 -0400 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2015-05-04 06:58:18 -0400 |
commit | 039aa4d68067161a7bd63aac9c2abc610aafab22 (patch) | |
tree | f9bc346809ea87807115b59eb48404e34450cf43 | |
parent | b787f68c36d49bb1d9236f403813641efa74a031 (diff) |
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: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r-- | drivers/soc/tegra/fuse/fuse-tegra20.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/soc/tegra/fuse/fuse-tegra20.c b/drivers/soc/tegra/fuse/fuse-tegra20.c index 5eff6f097f98..6acc2c44ee2c 100644 --- a/drivers/soc/tegra/fuse/fuse-tegra20.c +++ b/drivers/soc/tegra/fuse/fuse-tegra20.c | |||
@@ -59,6 +59,7 @@ static u32 tegra20_fuse_readl(const unsigned int offset) | |||
59 | int ret; | 59 | int ret; |
60 | u32 val = 0; | 60 | u32 val = 0; |
61 | struct dma_async_tx_descriptor *dma_desc; | 61 | struct dma_async_tx_descriptor *dma_desc; |
62 | unsigned long time_left; | ||
62 | 63 | ||
63 | mutex_lock(&apb_dma_lock); | 64 | mutex_lock(&apb_dma_lock); |
64 | 65 | ||
@@ -82,9 +83,10 @@ static u32 tegra20_fuse_readl(const unsigned int offset) | |||
82 | 83 | ||
83 | dmaengine_submit(dma_desc); | 84 | dmaengine_submit(dma_desc); |
84 | dma_async_issue_pending(apb_dma_chan); | 85 | dma_async_issue_pending(apb_dma_chan); |
85 | ret = wait_for_completion_timeout(&apb_dma_wait, msecs_to_jiffies(50)); | 86 | time_left = wait_for_completion_timeout(&apb_dma_wait, |
87 | msecs_to_jiffies(50)); | ||
86 | 88 | ||
87 | if (WARN(ret == 0, "apb read dma timed out")) | 89 | if (WARN(time_left == 0, "apb read dma timed out")) |
88 | dmaengine_terminate_all(apb_dma_chan); | 90 | dmaengine_terminate_all(apb_dma_chan); |
89 | else | 91 | else |
90 | val = *apb_buffer; | 92 | val = *apb_buffer; |