Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23658356 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Tomi Valkeinen
Browse files

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: default avatarNicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 25348160

drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c

+4 −3
Original line number Diff line number Diff line
@@ -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;