From fd268d35cbddff04fc0b27a8af2c97185c8a97ba Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Aug 2022 14:32:15 +0200 Subject: Merging upstream version 2.1.2. Signed-off-by: Daniel Baumann --- plugins/solidigm/solidigm-garbage-collection.c | 2 +- plugins/solidigm/solidigm-smart.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/solidigm') diff --git a/plugins/solidigm/solidigm-garbage-collection.c b/plugins/solidigm/solidigm-garbage-collection.c index c7f1286..415722b 100644 --- a/plugins/solidigm/solidigm-garbage-collection.c +++ b/plugins/solidigm/solidigm-garbage-collection.c @@ -86,7 +86,7 @@ int solidigm_get_garbage_collection_log(int argc, char **argv, struct command *c if (flags == -EINVAL) { fprintf(stderr, "Invalid output format '%s'\n", cfg.output_format); close(fd); - return fd; + return flags; } garbage_control_collection_log_t gc_log; diff --git a/plugins/solidigm/solidigm-smart.c b/plugins/solidigm/solidigm-smart.c index 4b30cab..77a2210 100644 --- a/plugins/solidigm/solidigm-smart.c +++ b/plugins/solidigm/solidigm-smart.c @@ -228,7 +228,7 @@ int solidigm_get_additional_smart_log(int argc, char **argv, struct command *cmd if (flags == -EINVAL) { fprintf(stderr, "Invalid output format '%s'\n", cfg.output_format); close(fd); - return fd; + return flags; } err = nvme_get_log_simple(fd, solidigm_vu_smart_log_id, sizeof(smart_log_payload), &smart_log_payload); -- cgit v1.2.3