From: Gregory C. Oakes <gregoryoakes@fastmail.com>
Date: Thu, 12 Mar 2020 17:36:56 +0000 (-0500)
Subject: Fixed malformed json output from sanitize-log.
X-Git-Tag: v1.11~21
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b662981526592dcb5bb881c005ea799b0087f4c9;p=users%2Fhch%2Fnvme-cli.git

Fixed malformed json output from sanitize-log.
---

diff --git a/nvme-print.c b/nvme-print.c
index 1aa1e27..579ac10 100644
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -3670,8 +3670,10 @@ void nvme_show_sanitize_log(struct nvme_sanitize_log_page *sanitize,
 
 	if (flags & BINARY)
 		d_raw((unsigned char *)sanitize, sizeof(*sanitize));
-	else if (flags & JSON)
+	else if (flags & JSON) {
 		json_sanitize_log(sanitize, devname);
+		return;
+	}
 
 	printf("Sanitize Progress                      (SPROG) :  %u",
 	       le16_to_cpu(sanitize->progress));