fbdev: pxafb: Fix multiple clamped values in pxafb_adjust_timing

commit 0155e868cbc111846cc2809c1546ea53810a56ae upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c
index a0db2b3d07368ab15a78c8edce4476a03c0ec220..be4102957c3fe471ae84abb7e7e5021f7bfa456a 100644 (file)
--- a/drivers/video/fbdev/pxafb.c
+++ b/drivers/video/fbdev/pxafb.c
@@ -418,12 +418,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 */