Merge branch 'common/fbdev-meram' of git://git.kernel.org/pub/scm/lin…

…ux/kernel/git/lethal/sh-3.x into fbdev-fixes-for-linus
caferrari · Jun 24, 2011 · 2bceec5 · 2bceec5
2 parents 2916001 + 06c8a6a
commit 2bceec5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);
 }