aboutsummaryrefslogtreecommitdiff
path: root/ubi-utils/ubinfo.c
diff options
context:
space:
mode:
Diffstat (limited to 'ubi-utils/ubinfo.c')
-rw-r--r--ubi-utils/ubinfo.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/ubi-utils/ubinfo.c b/ubi-utils/ubinfo.c
index 29530be..6c5b19e 100644
--- 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);
@@ -430,7 +427,6 @@ int main(int argc, char * const argv[])
if (err)
goto out_libubi;
-out:
libubi_close(libubi);
return 0;