From 913bd1f5f2c413a8d5aded783071473a43c3f954 Mon Sep 17 00:00:00 2001 From: xuhuicong Date: Thu, 27 Oct 2016 15:19:44 +0800 Subject: [PATCH] video: rockchip: hdmi: fix panic if enable hdcp buy load key fail Change-Id: I8550983a61fdb806680d40ce4281cdfe4ae101f8 Signed-off-by: xuhuicong --- .../rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hdcp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hdcp.c b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hdcp.c index b0f7774a119e..d5216ac0af06 100644 --- a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hdcp.c +++ b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hdcp.c @@ -669,6 +669,10 @@ void rockchip_hdmiv2_hdcp_init(struct hdmi *hdmi) pr_info("%s", __func__); if (!hdcp) hdcp_init(hdmi); - else - hdcp_load_key(hdmi, hdcp->keys); + else { + if (hdcp->keys) + hdcp_load_key(hdmi, hdcp->keys); + else + pr_info("hdcpkeys is no load\n"); + } } -- 2.34.1