diff options
| author | Nicholas Mc Guire <hofrat@osadl.org> | 2016-07-25 13:12:47 -0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-08-11 10:54:54 -0400 |
| commit | 23658356665f726c5e69da5e658100c1f064dc8d (patch) | |
| tree | 63956951108668571da466d0741173bbf0ecb91e /drivers/video | |
| parent | 25348160e9a444d64f589a8106bc06549934223e (diff) | |
omapfb/dss: wait_for_completion_interruptible_timeout expects long
wait_for_completion_timeout_interruptible returns long not unsigned long.
an appropriately typed variable is introduced and assignments fixed up.
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c b/drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c index 3691bde4ce0a..a864608c5df1 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c | |||
| @@ -644,6 +644,7 @@ int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask, | |||
| 644 | { | 644 | { |
| 645 | 645 | ||
| 646 | int r; | 646 | int r; |
| 647 | long time_left; | ||
| 647 | DECLARE_COMPLETION_ONSTACK(completion); | 648 | DECLARE_COMPLETION_ONSTACK(completion); |
| 648 | 649 | ||
| 649 | r = omap_dispc_register_isr(dispc_irq_wait_handler, &completion, | 650 | r = omap_dispc_register_isr(dispc_irq_wait_handler, &completion, |
| @@ -652,15 +653,15 @@ int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask, | |||
| 652 | if (r) | 653 | if (r) |
| 653 | return r; | 654 | return r; |
| 654 | 655 | ||
| 655 | timeout = wait_for_completion_interruptible_timeout(&completion, | 656 | time_left = wait_for_completion_interruptible_timeout(&completion, |
| 656 | timeout); | 657 | timeout); |
| 657 | 658 | ||
| 658 | omap_dispc_unregister_isr(dispc_irq_wait_handler, &completion, irqmask); | 659 | omap_dispc_unregister_isr(dispc_irq_wait_handler, &completion, irqmask); |
| 659 | 660 | ||
| 660 | if (timeout == 0) | 661 | if (time_left == 0) |
| 661 | return -ETIMEDOUT; | 662 | return -ETIMEDOUT; |
| 662 | 663 | ||
| 663 | if (timeout == -ERESTARTSYS) | 664 | if (time_left == -ERESTARTSYS) |
| 664 | return -ERESTARTSYS; | 665 | return -ERESTARTSYS; |
| 665 | 666 | ||
| 666 | return 0; | 667 | return 0; |
