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

This commit is contained in:
Tom Rini 2013-12-16 09:30:52 -05:00
commit 215ab45a67

View file

@ -889,7 +889,7 @@ int32_t ipu_init_sync_panel(int disp, uint32_t pixel_clk,
debug("panel size = %d x %d\n", width, height);
if ((v_sync_width == 0) || (h_sync_width == 0))
return EINVAL;
return -EINVAL;
adapt_panel_to_ipu_restricitions(&pixel_clk, width, height,
h_start_width, h_end_width,