Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0

[firefly-linux-kernel-4.4.55.git] / drivers / video / au1200fb.c

diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c
index e77e8e4280fb4005854f68c5450031d4764b040b..5dff32ac8044be8de287c7e4c156dd0c577eb3c8 100644 (file)
--- a/drivers/video/au1200fb.c
+++ b/drivers/video/au1200fb.c
@@ -1079,7 +1079,7 @@ static int au1200fb_fb_check_var(struct fb_var_screeninfo *var,
         * clock can only be obtain by dividing this value by an even integer.
         * Fallback to a slower pixel clock if necessary. */
        pixclock = max((u32)(PICOS2KHZ(var->pixclock) * 1000), fbi->monspecs.dclkmin);
-       pixclock = min(pixclock, min(fbi->monspecs.dclkmax, (u32)AU1200_LCD_MAX_CLK/2));
+       pixclock = min3(pixclock, fbi->monspecs.dclkmax, (u32)AU1200_LCD_MAX_CLK/2);
 
        if (AU1200_LCD_MAX_CLK % pixclock) {
                int diff = AU1200_LCD_MAX_CLK % pixclock;
@@ -1572,7 +1572,7 @@ static int au1200fb_init_fbinfo(struct au1200fb_device *fbdev)
        /* Copy monitor specs from panel data */
        /* fixme: we're setting up LCD controller windows, so these dont give a
        damn as to what the monitor specs are (the panel itself does, but that
-       isnt done here...so maybe need a generic catchall monitor setting??? */
+       isn't done here...so maybe need a generic catchall monitor setting??? */
        memcpy(&fbi->monspecs, &panel->monspecs, sizeof(struct fb_monspecs));
 
        /* We first try the user mode passed in argument. If that failed,