summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.c b/drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.c
index 5df00e940333..3b8d165dc832 100644
--- a/drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.c
+++ b/drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.c
@@ -639,18 +639,25 @@ static int vcap_show_admin(struct vcap_control *vctrl,
mutex_lock(&admin->lock);
list_for_each_entry(elem, &admin->rules, list) {
ri = vcap_dup_rule(elem);
- if (IS_ERR(ri))
- goto free_rule;
+ if (IS_ERR(ri)) {
+ ret = PTR_ERR(ri);
+ goto err_unlock;
+ }
/* Read data from VCAP */
ret = vcap_read_rule(ri);
if (ret)
- goto free_rule;
+ goto err_free_rule;
out->prf(out->dst, "\n");
vcap_show_admin_rule(vctrl, admin, out, ri);
-free_rule:
vcap_free_rule((struct vcap_rule *)ri);
}
mutex_unlock(&admin->lock);
+ return 0;
+
+err_free_rule:
+ vcap_free_rule((struct vcap_rule *)ri);
+err_unlock:
+ mutex_unlock(&admin->lock);
return ret;
}