diff --git a/drivers/media/platform/msm/cvp/msm_cvp_common.c b/drivers/media/platform/msm/cvp/msm_cvp_common.c
index e33cae49cbad..d09720e90c1e 100644
--- a/drivers/media/platform/msm/cvp/msm_cvp_common.c
+++ b/drivers/media/platform/msm/cvp/msm_cvp_common.c
@@ -1605,7 +1605,8 @@ int cvp_comm_set_arp_buffers(struct msm_cvp_inst *inst)
 	return rc;
 
 error:
-	cvp_release_arp_buffers(inst);
+	if (rc != -ENOMEM)
+		cvp_release_arp_buffers(inst);
 	return rc;
 }