diff --git a/drivers/platform/msm/ipa/ipa_v2/ipa_uc.c b/drivers/platform/msm/ipa/ipa_v2/ipa_uc.c
index d9bcc9b391f6..fe24e563861c 100644
--- a/drivers/platform/msm/ipa/ipa_v2/ipa_uc.c
+++ b/drivers/platform/msm/ipa/ipa_v2/ipa_uc.c
@@ -363,7 +363,7 @@ static void ipa_uc_event_handler(enum ipa_irq_type interrupt,
 			IPAERR("IPA has encountered a ZIP engine error\n");
 			ipa_ctx->uc_ctx.uc_zip_error = true;
 		}
-		BUG();
+		BUG_ON(evt.params.errorType != IPA_HW_ERROR_NONE);
 	} else if (ipa_ctx->uc_ctx.uc_sram_mmio->eventOp ==
 		IPA_HW_2_CPU_EVENT_LOG_INFO) {
 		IPADBG("uC evt log info ofst=0x%x\n",
@@ -642,7 +642,7 @@ int ipa_uc_send_cmd(u32 cmd, u32 opcode, u32 expected_status,
 					uc_ctx.uc_error_type));
 			}
 			mutex_unlock(&ipa_ctx->uc_ctx.uc_lock);
-			BUG();
+			BUG_ON(ipa_ctx->uc_ctx.uc_error_type != IPA_HW_ERROR_NONE);
 			return -EFAULT;
 		}
 	} else {
@@ -655,7 +655,7 @@ int ipa_uc_send_cmd(u32 cmd, u32 opcode, u32 expected_status,
 					uc_ctx.uc_error_type));
 			}
 			mutex_unlock(&ipa_ctx->uc_ctx.uc_lock);
-			BUG();
+			BUG_ON(ipa_ctx->uc_ctx.uc_error_type != IPA_HW_ERROR_NONE);
 			return -EFAULT;
 		}
 	}
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_uc.c b/drivers/platform/msm/ipa/ipa_v3/ipa_uc.c
index 89dde7dbb5f2..447faf409490 100644
--- a/drivers/platform/msm/ipa/ipa_v3/ipa_uc.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_uc.c
@@ -347,7 +347,7 @@ static void ipa3_uc_event_handler(enum ipa_irq_type interrupt,
 		ipa3_ctx->uc_ctx.uc_error_type = evt.params.errorType;
 		ipa3_ctx->uc_ctx.uc_error_timestamp =
 			ipahal_read_reg(IPA_TAG_TIMER);
-		BUG();
+		BUG_ON(evt.params.errorType != IPA_HW_ERROR_NONE);
 	} else if (ipa3_ctx->uc_ctx.uc_sram_mmio->eventOp ==
 		IPA_HW_2_CPU_EVENT_LOG_INFO) {
 		IPADBG("uC evt log info ofst=0x%x\n",
@@ -547,7 +547,7 @@ static int ipa3_uc_send_cmd_64b_param(u32 cmd_lo, u32 cmd_hi, u32 opcode,
 					uc_ctx.uc_error_type));
 			}
 			IPA3_UC_UNLOCK(flags);
-			BUG();
+			BUG_ON(ipa3_ctx->uc_ctx.uc_error_type != IPA_HW_ERROR_NONE);
 			return -EFAULT;
 		}
 	} else {
@@ -560,7 +560,7 @@ static int ipa3_uc_send_cmd_64b_param(u32 cmd_lo, u32 cmd_hi, u32 opcode,
 					uc_ctx.uc_error_type));
 			}
 			IPA3_UC_UNLOCK(flags);
-			BUG();
+			BUG_ON(ipa3_ctx->uc_ctx.uc_error_type != IPA_HW_ERROR_NONE);
 			return -EFAULT;
 		}
 	}