video: rockchip: hdmi: sync to develop-3.10

[firefly-linux-kernel-4.4.55.git] / drivers / video / rockchip / hdmi / rockchip-hdmiv2 / rockchip_hdmiv2_hdcp.c

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 83fc1ab5a4e59155d6237ec8ed972fda3bbaa5d1..b6d989e217123c9f94cd0cf7a1e13a30732b5153 100644 (file)
--- a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hdcp.c
+++ b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hdcp.c
@@ -392,10 +392,9 @@ static void hdcp_load_keys_cb(const struct firmware *fw,
                        return;
                }
                hdcp->seeds = kmalloc(HDCP_KEY_SEED_SIZE, GFP_KERNEL);
-               if (hdcp->seeds == NULL) {
-                       pr_err("HDCP: can't allocated space for seed keys\n");
+               if (!hdcp->seeds)
                        return;
-               }
+
                memcpy(hdcp->seeds, fw->data + HDCP_KEY_SIZE,
                       HDCP_KEY_SEED_SIZE);
        }