msm: mdss: hdcp: handle hdcp off gracefully

As part of turning off HDCP, set HDCP status to
INACTIVE and cancel all pending works.

Change-Id: I38bcab2ec2ecbe7a825fe193d161073c4266fdc2
Signed-off-by: Narender Ankam <nankam@codeaurora.org>

diff --git a/drivers/video/fbdev/msm/mdss_hdmi_tx.c b/drivers/video/fbdev/msm/mdss_hdmi_tx.c
index 4f30f78..0778e43 100644 (file)
--- a/drivers/video/fbdev/msm/mdss_hdmi_tx.c
+++ b/drivers/video/fbdev/msm/mdss_hdmi_tx.c
@@ -1,4 +1,4 @@
-/* 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;