Patchwork [U-Boot] imx: nitrogen6x/mx6qsabrelite: Fix bug in board_video_skip

login
register
mail settings
Submitter Robert Winkler
Date June 13, 2013, 6:32 p.m.
Message ID <1371148342-11379-1-git-send-email-robert.winkler@boundarydevices.com>
Download mbox | patch
Permalink /patch/251146/
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Comments

Robert Winkler - June 13, 2013, 6:32 p.m.
Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com>
---
 board/boundary/nitrogen6x/nitrogen6x.c        | 4 +++-
 board/freescale/mx6qsabrelite/mx6qsabrelite.c | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
Stefano Babic - Sept. 10, 2013, 5:30 p.m.
On 13/06/2013 20:32, Robert Winkler wrote:
> Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com>
> ---
>  board/boundary/nitrogen6x/nitrogen6x.c        | 4 +++-
>  board/freescale/mx6qsabrelite/mx6qsabrelite.c | 4 +++-

Of course, we have not anymore mx6qsabrelite.c

Applied (only nitrogen part) to u-boot-imx, thanks !

Best regards,
Stefano Babic

Patch

diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index 0e2ab04..da0698d 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -660,6 +660,7 @@  int board_video_skip(void)
 		if (!panel) {
 			panel = displays[0].mode.name;
 			printf("No panel detected: default to %s\n", panel);
+			i = 0;
 		}
 	} else {
 		for (i = 0; i < ARRAY_SIZE(displays); i++) {
@@ -676,9 +677,10 @@  int board_video_skip(void)
 			       displays[i].mode.name,
 			       displays[i].mode.xres,
 			       displays[i].mode.yres);
-		} else
+		} else {
 			printf("LCD %s cannot be configured: %d\n",
 			       displays[i].mode.name, ret);
+		}
 	} else {
 		printf("unsupported panel %s\n", panel);
 		ret = -EINVAL;
diff --git a/board/freescale/mx6qsabrelite/mx6qsabrelite.c b/board/freescale/mx6qsabrelite/mx6qsabrelite.c
index 191084b..2a81165 100644
--- a/board/freescale/mx6qsabrelite/mx6qsabrelite.c
+++ b/board/freescale/mx6qsabrelite/mx6qsabrelite.c
@@ -595,6 +595,7 @@  int board_video_skip(void)
 		if (!panel) {
 			panel = displays[0].mode.name;
 			printf("No panel detected: default to %s\n", panel);
+			i = 0;
 		}
 	} else {
 		for (i = 0; i < ARRAY_SIZE(displays); i++) {
@@ -611,9 +612,10 @@  int board_video_skip(void)
 			       displays[i].mode.name,
 			       displays[i].mode.xres,
 			       displays[i].mode.yres);
-		} else
+		} else {
 			printf("LCD %s cannot be configured: %d\n",
 			       displays[i].mode.name, ret);
+		}
 	} else {
 		printf("unsupported panel %s\n", panel);
 		ret = -EINVAL;