diff options
author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-04-29 15:45:57 -0400 |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-04-29 15:45:57 -0400 |
commit | 3499b1d829649880be07248d6339d060266bbe96 (patch) | |
tree | f1329573ea1cb7e03bbe4ab756e3a35ac9a3ee6d | |
parent | 53027cdf2a676e19306011cb01cd9c7c00124cd6 (diff) | |
parent | aac63a4ac861476858d24a5a8b09098b1ef9c54d (diff) |
Merge branch 'fixes' of git://linuxtv.org/pinchartl/fbdev into fbdev-next
-rw-r--r-- | drivers/video/exynos/exynos_mipi_dsi_common.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/exynos/exynos_mipi_dsi_common.c b/drivers/video/exynos/exynos_mipi_dsi_common.c index 14909c1d3832..99f645183759 100644 --- a/drivers/video/exynos/exynos_mipi_dsi_common.c +++ b/drivers/video/exynos/exynos_mipi_dsi_common.c | |||
@@ -738,11 +738,11 @@ int exynos_mipi_dsi_set_display_mode(struct mipi_dsim_device *dsim, | |||
738 | if (dsim_config->auto_vertical_cnt == 0) { | 738 | if (dsim_config->auto_vertical_cnt == 0) { |
739 | exynos_mipi_dsi_set_main_disp_vporch(dsim, | 739 | exynos_mipi_dsi_set_main_disp_vporch(dsim, |
740 | dsim_config->cmd_allow, | 740 | dsim_config->cmd_allow, |
741 | timing->upper_margin, | 741 | timing->lower_margin, |
742 | timing->lower_margin); | 742 | timing->upper_margin); |
743 | exynos_mipi_dsi_set_main_disp_hporch(dsim, | 743 | exynos_mipi_dsi_set_main_disp_hporch(dsim, |
744 | timing->left_margin, | 744 | timing->right_margin, |
745 | timing->right_margin); | 745 | timing->left_margin); |
746 | exynos_mipi_dsi_set_main_disp_sync_area(dsim, | 746 | exynos_mipi_dsi_set_main_disp_sync_area(dsim, |
747 | timing->vsync_len, | 747 | timing->vsync_len, |
748 | timing->hsync_len); | 748 | timing->hsync_len); |