Merge tag 'mmc-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

[cascardo/linux.git] / drivers / video / fbdev / omap2 / omapfb / dss / dispc-compat.c

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c b/drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c
index 3691bde..a864608 100644 (file)
--- 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,
 {
 
        int r;
+       long time_left;
        DECLARE_COMPLETION_ONSTACK(completion);
 
        r = omap_dispc_register_isr(dispc_irq_wait_handler, &completion,
@@ -652,15 +653,15 @@ int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask,
        if (r)
                return r;
 
-       timeout = wait_for_completion_interruptible_timeout(&completion,
+       time_left = wait_for_completion_interruptible_timeout(&completion,
                        timeout);
 
        omap_dispc_unregister_isr(dispc_irq_wait_handler, &completion, irqmask);
 
-       if (timeout == 0)
+       if (time_left == 0)
                return -ETIMEDOUT;
 
-       if (timeout == -ERESTARTSYS)
+       if (time_left == -ERESTARTSYS)
                return -ERESTARTSYS;
 
        return 0;