diff --git a/arch/arm64/kernel/mpam/mpam_ctrlmon.c b/arch/arm64/kernel/mpam/mpam_ctrlmon.c
index 8abbf2823269306a1cabeb1d877826d401d96e1a..7a0fec2978569bbc68ecce84900b33850842e9a7 100644
--- a/arch/arm64/kernel/mpam/mpam_ctrlmon.c
+++ b/arch/arm64/kernel/mpam/mpam_ctrlmon.c
@@ -769,7 +769,7 @@ int resctrl_mkdir_mondata_all_subdir(struct kernfs_node *parent_kn,
 {
 	struct resctrl_schema *s;
 	struct resctrl_resource *r;
-	int ret;
+	int ret = 0;
 
 	/*
 	 * Create the subdirectories for each domain. Note that all events
diff --git a/arch/arm64/kernel/mpam/mpam_device.c b/arch/arm64/kernel/mpam/mpam_device.c
index b3de7f518423ea20b94bf0fabcbed13f46b727bd..19c49f76d0e534a587e2de7073116f6ecca5f062 100644
--- a/arch/arm64/kernel/mpam/mpam_device.c
+++ b/arch/arm64/kernel/mpam/mpam_device.c
@@ -439,7 +439,7 @@ static irqreturn_t mpam_handle_error_irq(int irq, void *data)
 		return IRQ_NONE;
 
 	/* No-one expects MPAM errors! */
-	if (device_errcode <= _MPAM_NUM_ERRCODE)
+	if (device_errcode < _MPAM_NUM_ERRCODE)
 		pr_err_ratelimited("unexpected error '%s' [esr:%x]\n",
 					mpam_msc_err_str[device_errcode],
 					device_esr);