tools: env: return error if ubi_update_start() fails

The UBI_IOCVOLUP ioctl can fail if exclusive access to the volume isn't
obtained. If this happens, the flush operation doesn't return error,
leaving the caller without knowledge of missing flush.

Fix this by forwarding the error (-1) from ubi_update_start().

Fixes: 34255b92e6e ("tools: env: Add support for direct read/write UBI volumes")
Signed-off-by: Martin Hundebøll <martin@geanix.com>

diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index 66cb9d2a25e6ba6f64f82f6a9846b5f2d73e6a26..2a61a5d6f04982708e9c814a10ee9d2774645c10 100644 (file)
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c
@@ -1208,7 +1208,7 @@ static int flash_write(int fd_current, int fd_target, int dev_target)
 
        if (IS_UBI(dev_target)) {
                if (ubi_update_start(fd_target, CUR_ENVSIZE) < 0)
-                       return 0;
+                       return -1;
                return ubi_write(fd_target, environment.image, CUR_ENVSIZE);
        }