diff --git a/sys/dev/qat/qat_api/common/compression/dc_datapath.c b/sys/dev/qat/qat_api/common/compression/dc_datapath.c
--- a/sys/dev/qat/qat_api/common/compression/dc_datapath.c
+++ b/sys/dev/qat/qat_api/common/compression/dc_datapath.c
@@ -152,6 +152,7 @@
 
 	if (NULL != pOpData) {
 		verifyHwIntegrityCrcs = pOpData->verifyHwIntegrityCrcs;
+		integrityCrcCheck = pOpData->integrityCrcCheck;
 	}
 
 	hdrFlags = pCompRespMsg->comn_resp.hdr_flags;
@@ -175,10 +176,9 @@
 			(pService->pDcDpCb)(pResponse);
 		} else {
 			/* Free the memory pool */
-			if (NULL != pCookie) {
-				Lac_MemPoolEntryFree(pCookie);
-				pCookie = NULL;
-			}
+			Lac_MemPoolEntryFree(pCookie);
+			pCookie = NULL;
+
 			if (NULL != pCbFunc) {
 				pCbFunc(callbackTag, status);
 			}
@@ -432,10 +432,8 @@
 		}
 
 		/* Free the memory pool */
-		if (NULL != pCookie) {
-			Lac_MemPoolEntryFree(pCookie);
-			pCookie = NULL;
-		}
+		Lac_MemPoolEntryFree(pCookie);
+		pCookie = NULL;
 
 		if (NULL != pCbFunc) {
 			pCbFunc(callbackTag, status);
diff --git a/sys/dev/qat/qat_common/adf_hw_arbiter.c b/sys/dev/qat/qat_common/adf_hw_arbiter.c
--- a/sys/dev/qat/qat_common/adf_hw_arbiter.c
+++ b/sys/dev/qat/qat_common/adf_hw_arbiter.c
@@ -193,7 +193,7 @@
 void
 adf_disable_arb(struct adf_accel_dev *accel_dev)
 {
-	struct adf_hw_csr_ops *csr_ops = GET_CSR_OPS(accel_dev);
+	struct adf_hw_csr_ops *csr_ops;
 	struct resource *csr;
 	unsigned int i;
 
@@ -201,6 +201,7 @@
 		return;
 
 	csr = accel_dev->transport->banks[0].csr_addr;
+	csr_ops = GET_CSR_OPS(accel_dev);
 
 	/* Disable arbitration on all rings */
 	for (i = 0; i < GET_MAX_BANKS(accel_dev); i++)
diff --git a/sys/dev/qat/qat_hw/qat_4xxx/adf_4xxx_hw_data.c b/sys/dev/qat/qat_hw/qat_4xxx/adf_4xxx_hw_data.c
--- a/sys/dev/qat/qat_hw/qat_4xxx/adf_4xxx_hw_data.c
+++ b/sys/dev/qat/qat_hw/qat_4xxx/adf_4xxx_hw_data.c
@@ -747,7 +747,7 @@
 check_accel_unit_service(enum adf_accel_unit_services au_srv,
 			 enum adf_cfg_service_type ring_srv)
 {
-	if ((au_srv & ADF_ACCEL_SERVICE_NULL) && ring_srv == NA)
+	if ((ADF_ACCEL_SERVICE_NULL == au_srv) && ring_srv == NA)
 		return true;
 	if ((au_srv & ADF_ACCEL_COMPRESSION) && ring_srv == COMP)
 		return true;