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

Commit 6df3c2e2 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: hdcp: handle hdcp off gracefully"

parents a2aaf788 f2eeea4f

drivers/video/fbdev/msm/mdss_hdmi_tx.c

+3 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2010-2017, 2019, 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
@@ -3742,7 +3742,8 @@ static int hdmi_tx_hdcp_off(struct hdmi_tx_ctrl *hdmi_ctrl) 
	DEV_DBG("%s: Turning off HDCP\n", __func__);

	hdmi_ctrl->hdcp_ops->off(hdmi_ctrl->hdcp_data);



	flush_delayed_work(&hdmi_ctrl->hdcp_cb_work);

	hdmi_ctrl->hdcp_status = HDCP_STATE_INACTIVE;

	cancel_delayed_work(&hdmi_ctrl->hdcp_cb_work);



	hdmi_ctrl->hdcp_ops = NULL;