Commit 0155e868 authored by Thorsten Blum's avatar Thorsten Blum Committed by Helge Deller
Browse files

fbdev: pxafb: Fix multiple clamped values in pxafb_adjust_timing 



The variables were never clamped because the return value of clamp_val()
was not used. Fix this by assigning the clamped values, and use clamp()
instead of clamp_val().

Cc: stable@vger.kernel.org
Fixes: 3f16ff60 ("[ARM] pxafb: cleanup of the timing checking code")
Signed-off-by: default avatarThorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 35fa2b4b

drivers/video/fbdev/pxafb.c

+6 −6
Original line number Diff line number Diff line
@@ -419,12 +419,12 @@ static int pxafb_adjust_timing(struct pxafb_info *fbi, 
	var->yres = max_t(int, var->yres, MIN_YRES);



	if (!(fbi->lccr0 & LCCR0_LCDT)) {

		clamp_val(var->hsync_len, 1, 64);

		clamp_val(var->vsync_len, 1, 64);

		clamp_val(var->left_margin,  1, 255);

		clamp_val(var->right_margin, 1, 255);

		clamp_val(var->upper_margin, 1, 255);

		clamp_val(var->lower_margin, 1, 255);

		var->hsync_len = clamp(var->hsync_len, 1, 64);

		var->vsync_len = clamp(var->vsync_len, 1, 64);

		var->left_margin  = clamp(var->left_margin,  1, 255);

		var->right_margin = clamp(var->right_margin, 1, 255);

		var->upper_margin = clamp(var->upper_margin, 1, 255);

		var->lower_margin = clamp(var->lower_margin, 1, 255);

	}



	/* make sure each line is aligned on word boundary */