HDMI: 3288/3368: hdcp check firmware pointer.

	If firmware is NULL, HDCP is disabled.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

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 0e5a76c55d2463869cad492721357026a2e96454..6beeaf1bebdeb0e9813b1d7be78d7bcf99146616 100644 (file)
--- a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hdcp.c
+++ b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hdcp.c
@@ -88,6 +88,10 @@ static void hdcp_load_keys_cb(const struct firmware *fw,
 {
        struct hdmi *hdmi = (struct hdmi *)context;
 
+       if (fw == NULL) {
+               pr_info("HDCP: firmware is not loaded\n");
+               return;
+       }
        if (fw->size < HDCP_KEY_SIZE) {
                pr_err("HDCP: firmware wrong size %d\n", (int)fw->size);
                return;
@@ -238,7 +242,10 @@ static ssize_t hdcp_enable_write(struct device *device,
 
        if (hdcp == NULL)
                return -EINVAL;
-
+       if (hdcp->keys == NULL) {
+               pr_err("HDCP: key is not loaded\n");
+               return -EINVAL;
+       }
        if (kstrtoint(buf, 0, &enable))
                return -EINVAL;