From 2dc6c2c455deee5bfe4bddc88fe400cecde66506 Mon Sep 17 00:00:00 2001 From: yicheng shen Date: Fri, 30 Mar 2018 15:39:35 +0800 Subject: [PATCH] hdmirx: fix Coverity errors PD#163391: hdmirx: fix Coverity errors #629 #633~640 #643 #587 #691~692 #715 #721 #757~759 #761 #601 #861 Change-Id: I088bc5f13bcad837e26d6216363063cad2ac497c Signed-off-by: yicheng shen --- drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h | 2 +- drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_repeater.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h index e16b384fd0a0..7dad7653436e 100644 --- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h +++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h @@ -34,7 +34,7 @@ //#include "hdmi_rx_edid.h" -#define RX_VER0 "ver.2018-03-19-S" +#define RX_VER0 "ver.2018-03-30" /* * * diff --git a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_repeater.c b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_repeater.c index de9f6734ebf8..1531e70fc8fc 100644 --- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_repeater.c +++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_repeater.c @@ -355,6 +355,10 @@ void rx_modify_edid(unsigned char *buffer, addition_size = (*addition & 0x1f) + 1; cur_data = kmalloc( addition_size + cur_size, GFP_KERNEL); + if (cur_data != 0) { + rx_pr("allocate cur_data memory failed\n"); + return; + } memcpy(cur_data, buffer + start_addr, cur_size); /*add addition block property to local edid*/ rx_mix_block(cur_data, addition); @@ -395,9 +399,8 @@ void rx_modify_edid(unsigned char *buffer, /*copy current edid data*/ memcpy(buffer + start_addr_temp, cur_data, addition_size); - if (cur_data != 0) - kfree(cur_data); } + kfree(cur_data); } void rx_edid_update_audio_info(unsigned char *p_edid,