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 12:58:18 +0200 |
| commit | 039aa4d68067161a7bd63aac9c2abc610aafab22 (patch) | |
| tree | f9bc346809ea87807115b59eb48404e34450cf43 /drivers/soc | |
| parent | b787f68c36d49bb1d9236f403813641efa74a031 (diff) | |
| download | talos-obmc-linux-039aa4d68067161a7bd63aac9c2abc610aafab22.tar.gz talos-obmc-linux-039aa4d68067161a7bd63aac9c2abc610aafab22.zip | |
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>
Diffstat (limited to 'drivers/soc')
| -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) int ret; u32 val = 0; struct dma_async_tx_descriptor *dma_desc; + unsigned long time_left; mutex_lock(&apb_dma_lock); @@ -82,9 +83,10 @@ static u32 tegra20_fuse_readl(const unsigned int offset) dmaengine_submit(dma_desc); 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); else val = *apb_buffer; |
