Merge "msm: mdss: Change histogram collect error in mdp3 to EPROTO" (f73033b6) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdp3_ctrl.c

+9 −8

Original line number	Diff line number	Diff line
		@@ -1347,6 +1347,7 @@ static int mdp3_histogram_stop(struct mdp3_session_data *session,
		mutex_lock(&session->histo_lock);

		if (!session->histo_status) {
		pr_debug("mdp3_histogram_stop already stopped!");
		ret = 0;
		goto histogram_stop_err;
		}
		@@ -1376,21 +1377,21 @@ static int mdp3_histogram_collect(struct mdp3_session_data *session,
		return -EINVAL;
		}

		if (!session->clk_on) {
		pr_debug("mdp/dsi clock off currently\n");
		return -EPERM;
		}

		mutex_lock(&session->histo_lock);

		if (!session->histo_status) {
		pr_err("mdp3_histogram_collect not started\n");
		pr_debug("mdp3_histogram_collect not started\n");
		mutex_unlock(&session->histo_lock);
		return -EPERM;
		return -EPROTO;
		}

		mutex_unlock(&session->histo_lock);

		if (!session->clk_on) {
		pr_debug("mdp/dsi clock off currently\n");
		return -EPERM;
		}

		mdp3_clk_enable(1, 0);
		ret = session->dma->get_histo(session->dma);
		mdp3_clk_enable(0, 0);
		@@ -1691,7 +1692,7 @@ static int mdp3_ctrl_ioctl_handler(struct msm_fb_data_type *mfd,
		req = &mdp3_session->req_overlay;

		if (!mdp3_session->status && cmd != MSMFB_METADATA_GET &&
		cmd != MSMFB_HISTOGRAM_STOP) {
		cmd != MSMFB_HISTOGRAM_STOP && cmd != MSMFB_HISTOGRAM) {
		pr_err("mdp3_ctrl_ioctl_handler, display off!\n");
		return -EPERM;
		}