Skip to contentSkip to conversation

mx6: video_skip: Fix crash on NULL pointer

PATCH New picmaster at mail.bg 2 participants 2 messages Nov 5, 2014 – Nov 13, 2014

Subsystems (2)
Arm (32-bit) Arm i.MX and Layerscape
lore
Share & tools
lore

picmaster at mail.bg

author
#0 lore raw

PATCH 1/1 mx6: video_skip: Fix crash on NULL pointer

From: Nikolay Dimitrov <[email protected]>

Signed-off-by Nikolay Dimitrov <[email protected]>
Cc Stefano Babic <[email protected]>
---
 arch/arm/imx-common/video.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm/imx-common/video.c +5 -1
index 8651b80..46f8a1e 100644
@@ -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,
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 mx6: video_skip: Fix crash on NULL pointer

Hi Nikolay,

Quoted 5 lines · picmaster at mail.bg

From: Nikolay Dimitrov <[email protected]>

Signed-off-by Nikolay Dimitrov <[email protected]>
Cc Stefano Babic <[email protected]>

---

Applied to -u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================