diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2023-07-30 18:55:14 -0700 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2023-07-30 18:55:14 -0700 |
| commit | c73778244ff1929b58dfd79998ba01f39b33bd52 (patch) | |
| tree | 1ad6661ce037cff40b7e4fb116d30b5b0a74ae99 | |
| parent | 002fbfbf373294d378cca0d1546fd6dd2056ed5c (diff) | |
| parent | ae9b26f11fd2ad2acccc0aed2bf0a031af67bb11 (diff) | |
| download | samsung-c73778244ff1929b58dfd79998ba01f39b33bd52.tar.gz | |
Merge android14-gs-pixel-5.15-udc-qpr1 into android14-gs-pixel-5.15
SBMerger: 526756187
Change-Id: I6aa57ade4d6317bf6f67c1de3db039755c241fa5
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | auth-control.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/auth-control.c b/auth-control.c index 44ed418..b42db4b 100644 --- a/auth-control.c +++ b/auth-control.c @@ -107,6 +107,8 @@ void hdcp_dplink_connect_state(enum dp_state dp_hdcp_state) { hdcp22_dplink_abort(); hdcp_tee_disable_enc(); state = HDCP_AUTH_IDLE; + if (delayed_work_pending(&hdcp_work)) + cancel_delayed_work(&hdcp_work); return; } |