From: Jeff Lien Date: Wed, 17 Mar 2021 13:54:19 +0000 (-0500) Subject: [NVMe-CLI] SN730 Updates for FW Maintenance Release X-Git-Tag: v1.14~39 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7187de2896ec3ccfe645007006f9150aa53f7846;p=users%2Fsagi%2Fnvme-cli.git [NVMe-CLI] SN730 Updates for FW Maintenance Release --- diff --git a/plugins/wdc/wdc-nvme.c b/plugins/wdc/wdc-nvme.c index 108aa7d8..78fb8d86 100644 --- a/plugins/wdc/wdc-nvme.c +++ b/plugins/wdc/wdc-nvme.c @@ -7576,18 +7576,18 @@ static int wdc_vs_drive_info(int argc, char **argv, else if ((capabilities & WDC_DRIVE_CAP_INFO_2) == WDC_DRIVE_CAP_INFO_2) { memcpy(vsData, &ctrl.vs[0], 32); - major_rev = vsData[20]; - minor_rev = vsData[21]; + major_rev = ctrl.sn[12]; + minor_rev = ctrl.sn[13]; if (fmt == NORMAL) { - printf("Drive HW Revison: %c.%c \n", major_rev, minor_rev); - printf("Customer SN: %-.*s\n", 14, &vsData[0]); + printf("Drive HW Revision: %c.%c \n", major_rev, minor_rev); + printf("Customer SN: %-.*s\n", 14, &ctrl.sn[0]); } else if (fmt == JSON) { root = json_create_object(); sprintf(rev_str, "%c.%c", major_rev, minor_rev); json_object_add_value_string(root, "Drive HW Revison", rev_str); - wdc_StrFormat(formatter, sizeof(formatter), &vsData[0], 14); + wdc_StrFormat(formatter, sizeof(formatter), &ctrl.sn[0], 14); json_object_add_value_string(root, "Customer SN", formatter); json_print_object(root, NULL);