Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 703e747a authored by Colin Ian King's avatar Colin Ian King Committed by Martin K. Petersen
Browse files

scsi: qedi: return via va_end to match corresponding va_start 



Although on most systems va_end is a no-op, it is good practice to use
va_end on the function return path, especially since the va_start
documenation states:

  "Each invocation of va_start() must be matched by a corresponding
   invocation of va_end() in the same function."

Found with static analysis by CoverityScan, CIDs 1389477-1389479

Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Acked-by: default avatarManish Rangankar <manish.rangankar@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent a5c1be70

drivers/scsi/qedi/qedi_dbg.c

+6 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ qedi_dbg_warn(struct qedi_dbg_ctx *qedi, const char *func, u32 line, 
	vaf.va = &va;



	if (!(qedi_dbg_log & QEDI_LOG_WARN))

		return;

		goto ret;



	if (likely(qedi) && likely(qedi->pdev))

		pr_warn("[%s]:[%s:%d]:%d: %pV", dev_name(&qedi->pdev->dev),
@@ -60,6 +60,7 @@ qedi_dbg_warn(struct qedi_dbg_ctx *qedi, const char *func, u32 line, 
	else

		pr_warn("[0000:00:00.0]:[%s:%d]: %pV", nfunc, line, &vaf);



ret:

	va_end(va);

}
@@ -80,7 +81,7 @@ qedi_dbg_notice(struct qedi_dbg_ctx *qedi, const char *func, u32 line, 
	vaf.va = &va;



	if (!(qedi_dbg_log & QEDI_LOG_NOTICE))

		return;

		goto ret;



	if (likely(qedi) && likely(qedi->pdev))

		pr_notice("[%s]:[%s:%d]:%d: %pV",
@@ -89,6 +90,7 @@ qedi_dbg_notice(struct qedi_dbg_ctx *qedi, const char *func, u32 line, 
	else

		pr_notice("[0000:00:00.0]:[%s:%d]: %pV", nfunc, line, &vaf);



ret:

	va_end(va);

}
@@ -109,7 +111,7 @@ qedi_dbg_info(struct qedi_dbg_ctx *qedi, const char *func, u32 line, 
	vaf.va = &va;



	if (!(qedi_dbg_log & level))

		return;

		goto ret;



	if (likely(qedi) && likely(qedi->pdev))

		pr_info("[%s]:[%s:%d]:%d: %pV", dev_name(&qedi->pdev->dev),
@@ -117,6 +119,7 @@ qedi_dbg_info(struct qedi_dbg_ctx *qedi, const char *func, u32 line, 
	else

		pr_info("[0000:00:00.0]:[%s:%d]: %pV", nfunc, line, &vaf);



ret:

	va_end(va);

}