Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2021-05-15 13:31:55 -07:00
2 changed files with 8 additions and 1 deletions

View File

@@ -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);

View File

@@ -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];