From 11076f0cac4cceff78fe673c52b6891ee9286471 Mon Sep 17 00:00:00 2001 From: Nikolay Dimitrov Date: Wed, 5 Nov 2014 10:55:33 +0200 Subject: [PATCH] mx6: video_skip: Fix crash on NULL pointer Signed-off-by: Nikolay Dimitrov Cc: Stefano Babic --- arch/arm/imx-common/video.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/imx-common/video.c b/arch/arm/imx-common/video.c index 8651b80ce0..46f8a1e1dc 100644 --- a/arch/arm/imx-common/video.c +++ b/arch/arm/imx-common/video.c @@ -11,6 +11,7 @@ int board_video_skip(void) int i; int ret; char const *panel = getenv("panel"); + if (!panel) { for (i = 0; i < display_count; i++) { struct display_info_t const *dev = displays+i; @@ -31,11 +32,14 @@ int board_video_skip(void) break; } } + if (i < display_count) { ret = ipuv3_fb_init(&displays[i].mode, 0, displays[i].pixfmt); if (!ret) { - displays[i].enable(displays+i); + if (displays[i].enable) + displays[i].enable(displays + i); + printf("Display: %s (%ux%u)\n", displays[i].mode.name, displays[i].mode.xres, -- 2.25.1