diff options
| author | Tom Rini <trini@ti.com> | 2013-01-14 15:41:38 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-01-14 15:41:38 -0700 |
| commit | 981481958f98f17089bd3d776f71599756d9b9bd (patch) | |
| tree | 2b6e34258221bb953f9c45c1f1acf4de7129b2d3 /common | |
| parent | f1972e32559e34290f13654859264da331795ea5 (diff) | |
| parent | 44a53b57439dc1f117135b4f8c22d25915096164 (diff) | |
| download | u-boot-imx-981481958f98f17089bd3d776f71599756d9b9bd.zip u-boot-imx-981481958f98f17089bd3d776f71599756d9b9bd.tar.gz u-boot-imx-981481958f98f17089bd3d776f71599756d9b9bd.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'common')
| -rw-r--r-- | common/lcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/lcd.c b/common/lcd.c index 4778655..66d4f94 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -888,7 +888,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) } /* We support displaying 8bpp BMPs on 16bpp LCDs */ - if (bpix != bmp_bpix && (bmp_bpix != 8 || bpix != 16 || bpix != 32)) { + if (bpix != bmp_bpix && !(bmp_bpix == 8 && bpix == 16)) { printf ("Error: %d bit/pixel mode, but BMP has %d bit/pixel\n", bpix, le16_to_cpu(bmp->header.bit_count)); |