3 files changed, 10 insertions, 14 deletions
diff --git a/drivers/staging/fsl_dpa_offload/dpa_classifier.c b/drivers/staging/fsl_dpa_offload/dpa_classifier.c
index 751dacd..5f7c7f7 100644
--- a/drivers/staging/fsl_dpa_offload/dpa_classifier.c
+++ b/drivers/staging/fsl_dpa_offload/dpa_classifier.c
@@ -2784,10 +2784,6 @@ static int action_to_next_engine_params(const struct dpa_cls_tbl_action *action,
 		next_engine_params->nextEngine = e_FM_PCD_DONE;
 		next_engine_params->params.enqueueParams.action =
 			e_FM_PCD_DROP_FRAME;
-		if (action->enable_statistics)
-			next_engine_params->statisticsEn =
-				TRUE;
-
 		break;
 	case DPA_CLS_TBL_ACTION_ENQ:
 		if (distribution && classification) {
@@ -2863,10 +2859,6 @@ static int action_to_next_engine_params(const struct dpa_cls_tbl_action *action,
 					      action->enq_params.new_rel_vsp_id;
 #endif
 			}
-
-		if (action->enable_statistics)
-			next_engine_params->statisticsEn =
-				TRUE;
 		}
 
 		if (action->enq_params.hmd != DPA_OFFLD_DESC_NONE) {
@@ -2980,6 +2972,9 @@ static int action_to_next_engine_params(const struct dpa_cls_tbl_action *action,
 		return -EINVAL;
 	}
 
+	if (action->enable_statistics)
+		next_engine_params->statisticsEn = TRUE;
+
 	dpa_cls_dbg(("DEBUG: dpa_classifier %s (%d) <--\n", __func__,
 		__LINE__));
 
@@ -7485,8 +7480,6 @@ int dpa_classif_mcast_create_group(
 		pgroup->entries[0].used = true;
 		pgroup->member_ids[0] = 0;
 		pgroup->num_members++;
-
-		kfree(replic_grp_params);
 	} else {
 		pgroup->group = res->group_node;
 		/* mark prefilled members in index array member */
@@ -7499,6 +7492,8 @@ int dpa_classif_mcast_create_group(
 		pgroup->num_members = group_params->prefilled_members;
 	}
 
+	kfree(replic_grp_params);
+
 	if (!pgroup->group) {
 		log_err("Could not create %s group %d\n",
 			(group_params->prefilled_members > 0) ? "imported" :
@@ -7524,7 +7519,6 @@ dpa_classif_mcast_create_group_error:
 	}
 
 	*grpd = DPA_OFFLD_DESC_NONE;
-	kfree(replic_grp_params);
 
 	return err;
 }
diff --git a/drivers/staging/fsl_dpa_offload/wrp_dpa_ipsec.c b/drivers/staging/fsl_dpa_offload/wrp_dpa_ipsec.c
index 0d3ff7e..7b51e97 100644
--- a/drivers/staging/fsl_dpa_offload/wrp_dpa_ipsec.c
+++ b/drivers/staging/fsl_dpa_offload/wrp_dpa_ipsec.c
@@ -1335,7 +1335,8 @@ free:
 		break;
 	}
 	default:
-		pr_err("Invalid DPA IPsec ioctl\n");
+		pr_err("Invalid DPA IPsec ioctl (0x%x)\n", cmd);
+		ret = -EINVAL;
 		break;
 	}
 
@@ -1503,7 +1504,8 @@ free:
 		break;
 	}
 	default:
-		pr_err("Invalid DPA IPsec ioctl\n");
+		pr_err("Invalid DPA IPsec ioctl (0x%x)\n", cmd);
+		ret = -EINVAL;
 		break;
 	}
 
diff --git a/drivers/staging/fsl_dpa_offload/wrp_dpa_stats.c b/drivers/staging/fsl_dpa_offload/wrp_dpa_stats.c
index 6784cf5..f141aa8 100644
--- a/drivers/staging/fsl_dpa_offload/wrp_dpa_stats.c
+++ b/drivers/staging/fsl_dpa_offload/wrp_dpa_stats.c
@@ -1047,7 +1047,7 @@ create_cls_counter_cleanup:
 			kfree(cnode->keys[i]);
 		}
 		/* Restore user-space pointers */
-		tbl->keys = us_keys;
+		cnode->keys = us_keys;
 		break;
 	case DPA_STATS_CNT_IPSEC:
 		kfree(sa_ids);