diff --git a/drivers/misc/rk628/rk628.c b/drivers/misc/rk628/rk628.c
index 15df730c80486..cc4abbe41179d 100644
--- a/drivers/misc/rk628/rk628.c
+++ b/drivers/misc/rk628/rk628.c
@@ -1221,7 +1221,7 @@ rk628_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id)
 	return 0;
 }
 
-static int rk628_i2c_remove(struct i2c_client *client)
+static void rk628_i2c_remove(struct i2c_client *client)
 {
 	struct rk628 *rk628 = i2c_get_clientdata(client);
 	struct device *dev = &client->dev;
@@ -1234,8 +1234,6 @@ static int rk628_i2c_remove(struct i2c_client *client)
 	cancel_delayed_work_sync(&rk628->delay_work);
 	destroy_workqueue(rk628->monitor_wq);
 	pm_runtime_disable(dev);
-
-	return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP
diff --git a/drivers/misc/rk628/rk628_hdmitx.c b/drivers/misc/rk628/rk628_hdmitx.c
index eaa1c2ea0cec1..3ded2f4eb5b1d 100644
--- a/drivers/misc/rk628/rk628_hdmitx.c
+++ b/drivers/misc/rk628/rk628_hdmitx.c
@@ -604,7 +604,7 @@ static int rk628_hdmi_connector_get_modes(struct drm_connector *connector)
 
 		ret = rockchip_drm_add_modes_noedid(connector);
 
-		info->edid_hdmi_dc_modes = 0;
+		info->edid_hdmi_rgb444_dc_modes = 0;
 		info->hdmi.y420_dc_modes = 0;
 		info->color_formats = 0;