diff --git a/msm/msm_smmu.c b/msm/msm_smmu.c
index b31edece69..579fb81dfa 100644
--- a/msm/msm_smmu.c
+++ b/msm/msm_smmu.c
@@ -431,10 +431,11 @@ static int msm_smmu_fault_handler(struct iommu_domain *domain,
 		int flags, void *token)
 {
 	struct msm_smmu_client *client;
+	int rc = -EINVAL;
 
 	if (!token) {
 		DRM_ERROR("Error: token is NULL\n");
-		return -ENOSYS;
+		return -EINVAL;
 	}
 
 	client = (struct msm_smmu_client *)token;
@@ -448,7 +449,7 @@ static int msm_smmu_fault_handler(struct iommu_domain *domain,
 	 * return -ENOSYS to allow smmu driver to dump out useful
 	 * debug info.
 	 */
-	return -ENOSYS;
+	return rc;
 }
 
 /**
diff --git a/rotator/sde_rotator_smmu.c b/rotator/sde_rotator_smmu.c
index 7e27413a99..fafa1f28c3 100644
--- a/rotator/sde_rotator_smmu.c
+++ b/rotator/sde_rotator_smmu.c
@@ -459,10 +459,11 @@ static int sde_smmu_fault_handler(struct iommu_domain *domain,
 		int flags, void *token)
 {
 	struct sde_smmu_client *sde_smmu;
+	int rc = -EINVAL;
 
 	if (!token) {
 		SDEROT_ERR("Error: token is NULL\n");
-		return -ENOSYS;
+		return -EINVAL;
 	}
 
 	sde_smmu = (struct sde_smmu_client *)token;
@@ -479,7 +480,7 @@ static int sde_smmu_fault_handler(struct iommu_domain *domain,
 	 * return -ENOSYS to allow smmu driver to dump out useful
 	 * debug info.
 	 */
-	return -ENOSYS;
+	return rc;
 }
 
 static struct sde_smmu_domain sde_rot_unsec = {