[PATCH 5.1 42/62] net/mlx5e: Fix error flow in tx reporter diagnose

[Greg Kroah-Hartman]

From: Aya Levin <a...@mellanox.com>

[ Upstream commit 99d31cbd8953c6929da978bf049ab0f0b4e503d9 ]

Fix tx reporter's diagnose callback. Propagate error when failing to
gather diagnostics information or failing to print diagnostic data per
queue.

Fixes: de8650a82071 ("net/mlx5e: Add tx reporter support")
Signed-off-by: Aya Levin <a...@mellanox.com>
Reviewed-by: Tariq Toukan <tar...@mellanox.com>
Acked-by: Jiri Pirko <j...@mellanox.com>
Signed-off-by: Saeed Mahameed <sae...@mellanox.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
@@ -262,13 +262,13 @@ static int mlx5e_tx_reporter_diagnose(st
 
                err = mlx5_core_query_sq_state(priv->mdev, sq->sqn, &state);
                if (err)
-                       break;
+                       goto unlock;
 
                err = mlx5e_tx_reporter_build_diagnose_output(fmsg, sq->sqn,
                                                              state,
                                                              
netif_xmit_stopped(sq->txq));
                if (err)
-                       break;
+                       goto unlock;
        }
        err = devlink_fmsg_arr_pair_nest_end(fmsg);
        if (err)