diff mbox

[U-Boot] mx6: video_skip: Fix crash on NULL pointer

Message ID 1415177733-26963-1-git-send-email-picmaster@mail.bg
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Commit Message

Nikolay Dimitrov Nov. 5, 2014, 8:55 a.m. UTC 
From: Nikolay Dimitrov <picmaster@mail.bg>

Signed-off-by: Nikolay Dimitrov <picmaster@mail.bg>
Cc: Stefano Babic <sbabic@denx.de>
---
 arch/arm/imx-common/video.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Stefano Babic Nov. 13, 2014, 4:57 p.m. UTC | #1 
Hi Nikolay,

On 05/11/2014 09:55, picmaster@mail.bg wrote:
> From: Nikolay Dimitrov <picmaster@mail.bg>
> 
> Signed-off-by: Nikolay Dimitrov <picmaster@mail.bg>
> Cc: Stefano Babic <sbabic@denx.de>
> ---

Applied to -u-boot-imx, thanks !

Best regards,
Stefano Babic
diff mbox

Patch

diff --git a/arch/arm/imx-common/video.c b/arch/arm/imx-common/video.c
index 8651b80..46f8a1e 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,