From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756513AbdABWZl (ORCPT ); Mon, 2 Jan 2017 17:25:41 -0500 Received: from botnar.kaiser.cx ([176.28.20.183]:41966 "EHLO botnar.kaiser.cx" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933722AbdABWYi (ORCPT ); Mon, 2 Jan 2017 17:24:38 -0500 From: Martin Kaiser To: b.zolnierkie@samsung.com, kernel@pengutronix.de Cc: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH] video: imxfb: always allocate 256 entries for the color map Date: Mon, 2 Jan 2017 23:24:02 +0100 Message-Id: <1483395842-9675-1-git-send-email-martin@kaiser.cx> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1483395604-6931-1-git-send-email-martin@kaiser.cx> References: <1483395604-6931-1-git-send-email-martin@kaiser.cx> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The current code calculates the number of color map entries as 1 << info->var.bits_per_pixel. For 32bpp modes, 1 << 32 is 0 when written to an int variable. As a consequence, the subsequent copying of the default (non-empty) color map into our newly allocated color map fails and imxfb's probe function returns an error. On both imx1 and imx21 platforms, the color map is used only for modes with <= 8bpp. By allocating 256 entries for the color map, we're on the safe side. Signed-off-by: Martin Kaiser --- Re-sending: corrected a typo in the LKML address, sorry for that. drivers/video/fbdev/imxfb.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c index fe0c4ee..1b0faad 100644 --- a/drivers/video/fbdev/imxfb.c +++ b/drivers/video/fbdev/imxfb.c @@ -985,7 +985,11 @@ static int imxfb_probe(struct platform_device *pdev) */ imxfb_check_var(&info->var, info); - ret = fb_alloc_cmap(&info->cmap, 1 << info->var.bits_per_pixel, 0); + /* + * For modes > 8bpp, the color map is bypassed. + * Therefore, 256 entries are enough. + */ + ret = fb_alloc_cmap(&info->cmap, 256, 0); if (ret < 0) goto failed_cmap; -- 1.7.10.4