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

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

Merge "fbdev: msm: Add null check for sctl"

parents d409ad26 9bb342c0

drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c

+10 −0
Original line number Diff line number Diff line
@@ -1677,6 +1677,11 @@ static void clk_ctrl_delayed_off_work(struct work_struct *work) 


		/* re-assign to have the correct order in the context */

		ctx = (struct mdss_mdp_cmd_ctx *) ctl->intf_ctx[MASTER_CTX];

		if (!sctl) {

			pr_err("invalid sctl\n");

			goto exit;

		}



		sctx = (struct mdss_mdp_cmd_ctx *) sctl->intf_ctx[MASTER_CTX];

		if (!ctx || !sctx) {

			pr_err("invalid %s %s\n",
@@ -1784,6 +1789,11 @@ static void clk_ctrl_gate_work(struct work_struct *work) 


		/* re-assign to have the correct order in the context */

		ctx = (struct mdss_mdp_cmd_ctx *) ctl->intf_ctx[MASTER_CTX];

		if (!sctl) {

			pr_err("invalid sctl\n");

			goto exit;

		}



		sctx = (struct mdss_mdp_cmd_ctx *) sctl->intf_ctx[MASTER_CTX];

		if (!ctx || !sctx) {

			pr_err("%s ERROR invalid %s %s\n", __func__,