net/ice: fix GTPU down/uplink and extension conflict

[dpdk.git] / drivers / bus / fslmc / qbman / qbman_debug.c

diff --git a/drivers/bus/fslmc/qbman/qbman_debug.c b/drivers/bus/fslmc/qbman/qbman_debug.c
index 591673a..34374ae 100644 (file)
--- a/drivers/bus/fslmc/qbman/qbman_debug.c
+++ b/drivers/bus/fslmc/qbman/qbman_debug.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:        BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
  */
 
 #include "compat.h"
@@ -21,26 +20,27 @@ struct qbman_fq_query_desc {
        uint8_t verb;
        uint8_t reserved[3];
        uint32_t fqid;
-       uint8_t reserved2[57];
+       uint8_t reserved2[56];
 };
 
 int qbman_fq_query_state(struct qbman_swp *s, uint32_t fqid,
                         struct qbman_fq_query_np_rslt *r)
 {
        struct qbman_fq_query_desc *p;
+       struct qbman_fq_query_np_rslt *var;
 
        p = (struct qbman_fq_query_desc *)qbman_swp_mc_start(s);
        if (!p)
                return -EBUSY;
 
        p->fqid = fqid;
-       *r = *(struct qbman_fq_query_np_rslt *)qbman_swp_mc_complete(s, p,
-                                               QBMAN_FQ_QUERY_NP);
-       if (!r) {
+       var = qbman_swp_mc_complete(s, p, QBMAN_FQ_QUERY_NP);
+       if (!var) {
                pr_err("qbman: Query FQID %d NP fields failed, no response\n",
                       fqid);
                return -EIO;
        }
+       *r = *var;
 
        /* Decode the outcome */
        QBMAN_BUG_ON((r->verb & QBMAN_RESPONSE_VERB_MASK) != QBMAN_FQ_QUERY_NP);