Merge "video:fbdev: fix compiler issue due to improper braces or indentation" (f7317f27) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/video/fbdev/msm/mdss_fb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3036,7 +3036,7 @@ static int __mdss_fb_wait_for_fence_sub(struct msm_sync_pt_data *sync_pt_data,
		wait_ms = jiffies_to_msecs(wait_jf);
		if (wait_jf < 0)
		break;

		else
		wait_ms = min_t(long, WAIT_FENCE_FINAL_TIMEOUT,
		wait_ms);

+6 −4

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -1164,9 +1164,11 @@ static void mdss_dsi_phy_regulator_ctrl(struct mdss_dsi_ctrl_pdata *ctrl,
		* active.
		*/
		if (!mdss_dsi_is_hw_config_dual(sdata) \|\|
		(other_ctrl && (!other_ctrl->is_phyreg_enabled
		(other_ctrl &&
		(!other_ctrl->is_phyreg_enabled
		\|\| other_ctrl->mmss_clamp)))
		mdss_dsi_28nm_phy_regulator_enable(ctrl);
		mdss_dsi_28nm_phy_regulator_enable(
		ctrl);
		break;
		}
		}