From: Nikolay Dimitrov <picmaster@mail.bg>
Date: Wed, 5 Nov 2014 08:55:33 +0000 (+0200)
Subject: mx6: video_skip: Fix crash on NULL pointer
X-Git-Tag: v2015.01-rc2~79^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=11076f0cac4cceff78fe673c52b6891ee9286471;p=u-boot

mx6: video_skip: Fix crash on NULL pointer

Signed-off-by: Nikolay Dimitrov <picmaster@mail.bg>
Cc: Stefano Babic <sbabic@denx.de>
---

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,