]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
lcd: splashscreen: fix bmp panning issue introduced by merge
authorLothar Waßmann <LW@KARO-electronics.de>
Wed, 11 Dec 2013 09:35:05 +0000 (10:35 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Wed, 11 Dec 2013 09:35:05 +0000 (10:35 +0100)
common/lcd.c

index 98450ffe10f1b01051cc0a4df8ed4c31fa4032a7..4d2278d3c1e4ab05ee4909db3ded2b7d30479400 100644 (file)
@@ -1001,7 +1001,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
        splash_align_axis(&x, pwidth, width);
        splash_align_axis(&y, panel_info.vl_row, height);
 #endif /* CONFIG_SPLASH_SCREEN_ALIGN */
-       bmap = (uchar *)bmp + le32_to_cpu (bmp->header.data_offset);
+       bmap = (uchar *)bmp + le32_to_cpu(bmp->header.data_offset);
 
        if ((x + width) > pwidth)
                width = pwidth - x;
@@ -1010,7 +1010,6 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
                bmap += (panel_info.vl_row - y) * padded_width;
        }
 
-       bmap = (uchar *)bmp + le32_to_cpu(bmp->header.data_offset);
        fb   = (uchar *)(lcd_base +
                (y + height - 1) * lcd_line_length + x * bpix / 8);