From 39c51faa70685c403e733dd8f1b27cf5095721f0 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Tue, 16 Nov 2010 12:11:21 +0100 Subject: [PATCH] Correctly process display_all_controllers return value Add missing return value assignment, as pointed out by Steve Grubb. Changelog: - indent the 'if (ret)' lower. Signed-off-by: Jan Safranek Acked-by: Dhaval Giani Signed-off-by: Dhaval Giani --- src/tools/cgget.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/tools/cgget.c b/src/tools/cgget.c index aad222a1..1d3ad55c 100644 --- a/src/tools/cgget.c +++ b/src/tools/cgget.c @@ -384,10 +384,12 @@ int main(int argc, char *argv[]) if (ret) goto err; - if (mode & MODE_SHOW_ALL_CONTROLLERS) - display_all_controllers(argv[i], argv[0], mode); - if (ret) - result = ret; + if (mode & MODE_SHOW_ALL_CONTROLLERS) { + ret = display_all_controllers(argv[i], argv[0], mode); + /* remember the error but continue showing the rest */ + if (ret) + result = ret; + } /* Separate each group with empty line. */ if (mode & MODE_SHOW_HEADERS && i != argc-1) -- 2.47.2