Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / video / sh_mobile_meram.c

diff --git a/drivers/video/sh_mobile_meram.c b/drivers/video/sh_mobile_meram.c
index 9170c82..cc7d732 100644 (file)
--- a/drivers/video/sh_mobile_meram.c
+++ b/drivers/video/sh_mobile_meram.c
@@ -218,7 +218,7 @@ static inline void meram_get_next_icb_addr(struct sh_mobile_meram_info *pdata,
                icb_offset = 0xc0000000 | (cfg->current_reg << 23);
 
        *icb_addr_y = icb_offset | (cfg->icb[0].marker_icb << 24);
-       if ((*icb_addr_c) && is_nvcolor(cfg->pixelformat))
+       if (is_nvcolor(cfg->pixelformat))
                *icb_addr_c = icb_offset | (cfg->icb[1].marker_icb << 24);
 }