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

Commit 2bd8c475 authored by Roel Kluin's avatar Roel Kluin Committed by Linus Torvalds
Browse files

viafb: returns 0 two too early 



Otherwise this will already return 0 if iteration MAXLOOP-2 occurs in the
first loop.

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Cc: Joseph Chan <josephchan@via.com.tw>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b83734ec

drivers/video/via/accel.c

+6 −2
Original line number Diff line number Diff line
@@ -267,13 +267,17 @@ int viafb_wait_engine_idle(void) 
	int loop = 0;



	while (!(readl(viaparinfo->io_virt + VIA_REG_STATUS) &

			VIA_VR_QUEUE_BUSY) && (loop++ < MAXLOOP))

			VIA_VR_QUEUE_BUSY) && (loop < MAXLOOP)) {

		loop++;

		cpu_relax();

	}



	while ((readl(viaparinfo->io_virt + VIA_REG_STATUS) &

		    (VIA_CMD_RGTR_BUSY | VIA_2D_ENG_BUSY | VIA_3D_ENG_BUSY)) &&

		    (loop++ < MAXLOOP))

		    (loop < MAXLOOP)) {

		loop++;

		cpu_relax();

	}



	return loop >= MAXLOOP;

}