Skip to content

Commit 0155e86

Browse files
tobluxhdeller
authored andcommitted
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: 3f16ff6 ("[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>
1 parent 35fa2b4 commit 0155e86

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/video/fbdev/pxafb.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -419,12 +419,12 @@ static int pxafb_adjust_timing(struct pxafb_info *fbi,
419419
var->yres = max_t(int, var->yres, MIN_YRES);
420420

421421
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);
428428
}
429429

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

0 commit comments

Comments
 (0)