Merge tag 'u-boot-atmel-fixes-2021.01-b' of https://gitlab.denx.de/u-boot/custodians...

[platform/kernel/u-boot.git] / fs / btrfs / btrfs.c

diff --git a/fs/btrfs/btrfs.c b/fs/btrfs/btrfs.c
index cbf9dcf..346b2c4 100644 (file)
--- a/fs/btrfs/btrfs.c
+++ b/fs/btrfs/btrfs.c
@@ -36,7 +36,7 @@ static int show_dir(struct btrfs_root *root, struct extent_buffer *eb,
        char *target = NULL;
        char filetime[32];
        time_t mtime;
-       int ret;
+       int ret = 0;
 
        btrfs_dir_item_key_to_cpu(eb, di, &key);
 
@@ -150,7 +150,7 @@ int btrfs_ls(const char *path)
        }
        ret = btrfs_iter_dir(root, ino, show_dir);
        if (ret < 0) {
-               error("An error occured while listing directory %s", path);
+               error("An error occurred while listing directory %s", path);
                return ret;
        }
        return 0;
@@ -257,7 +257,7 @@ int btrfs_read(const char *file, void *buf, loff_t offset, loff_t len,
 
        ret = btrfs_file_read(root, ino, offset, len, buf);
        if (ret < 0) {
-               error("An error occured while reading file %s", file);
+               error("An error occurred while reading file %s", file);
                return ret;
        }