ubinfo: Fix --vol_id return code for absent volume id

When using --vol_id and that volume is missing, it should return
non-zero like the --name option does.

Signed-off-by: Andrew Mellor <andrew.mellor@casa-systems.com>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

diff --git a/ubi-utils/ubinfo.c b/ubi-utils/ubinfo.c
index 29530bebf7d4219f6bea5eb4c77a86adcac72b8a..53519cc1e05bfc7f673295f7adb5510184ffafda 100644 (file)
--- a/ubi-utils/ubinfo.c
+++ b/ubi-utils/ubinfo.c
@@ -417,12 +417,9 @@ int main(int argc, char * const argv[])
                goto out_libubi;
        }
 
-       if (args.devn != -1 && args.vol_id != -1) {
-               print_vol_info(libubi, args.devn, args.vol_id);
-               goto out;
-       }
-
-       if (args.devn == -1 && args.vol_id == -1)
+       if (args.devn != -1 && args.vol_id != -1)
+               err = print_vol_info(libubi, args.devn, args.vol_id);
+       else if (args.devn == -1 && args.vol_id == -1)
                err = print_general_info(libubi, args.all);
        else if (args.devn != -1 && args.vol_id == -1)
                err = print_dev_info(libubi, args.devn, args.all);