Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 3f16ff608a75 ("[ARM] pxafb: cleanup of the timing checking code")
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: Helge Deller <deller@gmx.de>

authored by

Thorsten Blum and committed by
Helge Deller
0155e868 35fa2b4b

+6 -6
+6 -6
drivers/video/fbdev/pxafb.c
··· 419 419 var->yres = max_t(int, var->yres, MIN_YRES); 420 420 421 421 if (!(fbi->lccr0 & LCCR0_LCDT)) { 422 - clamp_val(var->hsync_len, 1, 64); 423 - clamp_val(var->vsync_len, 1, 64); 424 - clamp_val(var->left_margin, 1, 255); 425 - clamp_val(var->right_margin, 1, 255); 426 - clamp_val(var->upper_margin, 1, 255); 427 - clamp_val(var->lower_margin, 1, 255); 422 + var->hsync_len = clamp(var->hsync_len, 1, 64); 423 + var->vsync_len = clamp(var->vsync_len, 1, 64); 424 + var->left_margin = clamp(var->left_margin, 1, 255); 425 + var->right_margin = clamp(var->right_margin, 1, 255); 426 + var->upper_margin = clamp(var->upper_margin, 1, 255); 427 + var->lower_margin = clamp(var->lower_margin, 1, 255); 428 428 } 429 429 430 430 /* make sure each line is aligned on word boundary */