From cc8e39d81b59caceda3794208136306be78117c6 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 15 May 2021 20:31:02 +0000 Subject: [PATCH] qla2x00t-32gbit: Minimize diffs with upstream git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9388 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t-32gbit/qla_attr.c | 5 ++++- qla2x00t-32gbit/qla_mr.h | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/qla2x00t-32gbit/qla_attr.c b/qla2x00t-32gbit/qla_attr.c index ad57111f8..3aa9869f6 100644 --- a/qla2x00t-32gbit/qla_attr.c +++ b/qla2x00t-32gbit/qla_attr.c @@ -2876,7 +2876,10 @@ qla2x00_reset_host_stats(struct Scsi_Host *shost) /* reset firmware statistics */ rval = qla24xx_get_isp_stats(base_vha, stats, stats_dma, BIT_0); - WARN_ONCE(rval != QLA_SUCCESS, "rval = %d\n", rval); + if (rval != QLA_SUCCESS) + ql_log(ql_log_warn, vha, 0x70de, + "Resetting ISP statistics failed: rval = %d\n", + rval); dma_free_coherent(&ha->pdev->dev, sizeof(*stats), stats, stats_dma); diff --git a/qla2x00t-32gbit/qla_mr.h b/qla2x00t-32gbit/qla_mr.h index eefbae9d7..4f63aff33 100644 --- a/qla2x00t-32gbit/qla_mr.h +++ b/qla2x00t-32gbit/qla_mr.h @@ -176,6 +176,10 @@ struct fxdisc_entry_fx00 { uint8_t flags; uint8_t reserved_1; + /* + * Use array size 1 below to prevent that Coverity complains about + * the append_dsd64() calls for the two arrays below. + */ struct dsd64 dseg_rq[1]; struct dsd64 dseg_rsp[1];