summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-06-13 08:50:58 -0400
committerTom Rini <trini@konsulko.com>2016-06-13 08:50:58 -0400
commitfd9102dafea5c6959401d0dbc5293a56d2261878 (patch)
tree5aad4472b833800daab260c94062fbaed2468d39 /lib
parenta52142855a1345c233af8bb76fb1ad4d3048e008 (diff)
parentc1631c8a04f53e694dd73bbb987b97eed5188517 (diff)
downloadblackbird-obmc-uboot-fd9102dafea5c6959401d0dbc5293a56d2261878.tar.gz
blackbird-obmc-uboot-fd9102dafea5c6959401d0dbc5293a56d2261878.zip
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'lib')
-rw-r--r--lib/fdtdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index ab002e9fa3..686b89da38 100644
--- 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)
OpenPOWER on IntegriCloud