diff --git a/drivers/input/touchscreen/chipone_tddi_v2_mmi/Android.mk b/drivers/input/touchscreen/chipone_tddi_v2_mmi/Android.mk
index 7b9d016cead2..cdad2617c817 100644
--- a/drivers/input/touchscreen/chipone_tddi_v2_mmi/Android.mk
+++ b/drivers/input/touchscreen/chipone_tddi_v2_mmi/Android.mk
@@ -55,4 +55,5 @@ ifneq ($(MOTO_PANEL_CHECK_TOUCH_STATE_V2),)
 	LOCAL_ADDITIONAL_DEPENDENCIES += $(KERNEL_MODULES_OUT)/msm_drm.ko
 endif
 KBUILD_OPTIONS += MODULE_KERNEL_VERSION=$(TARGET_KERNEL_VERSION)
+KBUILD_OPTIONS_GKI += GKI_OBJ_MODULE_DIR=gki
 include $(DLKM_DIR)/AndroidKernelModule.mk
diff --git a/drivers/input/touchscreen/ilitek_v3_mmi/ilitek_v3_qcom.c b/drivers/input/touchscreen/ilitek_v3_mmi/ilitek_v3_qcom.c
index b972ee9a6e80..d5185155135c 100644
--- a/drivers/input/touchscreen/ilitek_v3_mmi/ilitek_v3_qcom.c
+++ b/drivers/input/touchscreen/ilitek_v3_mmi/ilitek_v3_qcom.c
@@ -962,6 +962,7 @@ static int ilitek_plat_probe(void)
 	ret = ili_v3_drm_check_dt(ilits->dev->of_node);
 	if (ret) {
 		ILI_ERR("[ili_v3_drm_check_dt] parse drm-panel fail");
+		return ret;
 	}
 #endif
 #endif