Merge branch 'master' of git://git.denx.de/u-boot-atmel

2016-06-13 08:50:58 -04:00
parent a52142855a c1631c8a04
commit fd9102dafe
40 changed files with 5524 additions and 151 deletions
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -1170,7 +1170,7 @@ int fdtdec_decode_display_timing(const void *blob, int parent, int index,
 	if (fdtdec_get_bool(blob, node, "doubleclk"))
 		dt->flags |= DISPLAY_FLAGS_DOUBLECLK;

-	return 0;
+	return ret;
 }

 int fdtdec_setup(void)