Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11cb582c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: Fix locking error in histogram disable"

parents efb7def8 3e595599

drivers/video/msm/mdss/mdss_mdp_pp.c

+2 −1
Original line number Diff line number Diff line
@@ -3265,12 +3265,13 @@ static int pp_hist_disable(struct pp_hist_col_info *hist_info) 
	u32 intr_mask = is_hist_v2 ? 1 : 3;



	mutex_lock(&hist_info->hist_mutex);

	spin_lock_irqsave(&hist_info->hist_lock, flag);

	if (hist_info->col_en == false) {

		spin_unlock_irqrestore(&hist_info->hist_lock, flag);

		pr_debug("Histogram already disabled (%p)", hist_info->base);

		ret = -EINVAL;

		goto exit;

	}

	spin_lock_irqsave(&hist_info->hist_lock, flag);

	hist_info->col_en = false;

	hist_info->col_state = HIST_UNKNOWN;

	spin_unlock_irqrestore(&hist_info->hist_lock, flag);