diff options
author | Tom Rini <trini@konsulko.com> | 2020-10-22 21:36:47 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-10-22 21:36:47 +0300 |
commit | ae4fdd7b0432bcb0bc2fe7d90b6d3e92001ab478 (patch) | |
tree | e933e67609989d0e4960f1464384e9ff40732b30 /fs/btrfs/btrfs.c | |
parent | b90daf2743b38022bea8727ede867ad63e971db2 (diff) | |
parent | dddfde5401ed5ad82c996b35b61dc4a45bb4e2b3 (diff) | |
download | u-boot-ae4fdd7b0432bcb0bc2fe7d90b6d3e92001ab478.tar.xz |
Merge branch '2020-10-22-misc-changes'
- Assorted updates for Xen, IPQ40xx, ASpeed, Keymile
- Assorted typo / documentation fixes
- Fix default preboot cmd to act like before with USB_STORAGE set
- A number of other bugfixes throughout the code
Diffstat (limited to 'fs/btrfs/btrfs.c')
-rw-r--r-- | fs/btrfs/btrfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/btrfs.c b/fs/btrfs/btrfs.c index cbf9dcffeb..e48972ffa2 100644 --- a/fs/btrfs/btrfs.c +++ b/fs/btrfs/btrfs.c @@ -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; } |