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 862a525ca85f..c560a1cc0d8e 100644
--- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h
+++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h
@@ -46,7 +46,7 @@
  *
  *
  */
-#define RX_VER2 "ver.2018/09/04"
+#define RX_VER2 "ver.2018/09/06"
 
 /*print type*/
 #define	LOG_EN		0x01
diff --git a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_edid.c b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_edid.c
index 866642c181d4..f689ee34a604 100644
--- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_edid.c
+++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_edid.c
@@ -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,