shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge "hdmirx: fix kasan bug in rx_get_edid" into amlogic-4.9-dev

Browse Source
This commit is contained in:
Tao Zeng
2018-09-10 05:05:56 -07:00
committed by Gerrit Code Review
parent ce60ab4bd6 ad6584e66e
commit aed326664a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h
View File

@@ -46,7 +46,7 @@
*
*
*/
#define RX_VER2 "ver.2018/09/04"
#define RX_VER2 "ver.2018/09/06"
/*print type*/
#define LOG_EN 0x01

4
drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_edid.c
View File

@@ -1163,6 +1163,8 @@ unsigned int hdmi_rx_top_edid_update(void)
u_int phy_addr[E_PORT_NUM] = {0, 0, 0, 0};
u_char checksum[E_PORT_NUM] = {0, 0, 0, 0};
if (edid_index >= EDID_LIST_NUM)
return 0;
/* get edid from buffer, return buffer addr */
pedid_data = rx_get_edid(edid_index);
@@ -1195,7 +1197,7 @@ unsigned int hdmi_rx_top_edid_update(void)
/* update physical and checksum */
rx_edid_update_overlay(phy_addr_offset, phy_addr, checksum);
}
return true;
return 1;
}
void rx_edid_print_vic_fmt(unsigned char i,