diff options
| author | Heiko Schocher <hs@denx.de> | 2015-10-22 06:19:21 +0200 |
|---|---|---|
| committer | Heiko Schocher <hs@denx.de> | 2015-10-26 09:22:36 +0100 |
| commit | 0195a7bb36a0abc71145da419001377bf56662fd (patch) | |
| tree | bca19320118d4cbeb770d94f6b1e9d3ad91dc151 /common | |
| parent | 5219db8ae802210730b348a888474efc2f9bf0a4 (diff) | |
| download | blackbird-obmc-uboot-0195a7bb36a0abc71145da419001377bf56662fd.tar.gz blackbird-obmc-uboot-0195a7bb36a0abc71145da419001377bf56662fd.zip | |
ubi,ubifs: sync with linux v4.2
sync with linux v4.2
commit 64291f7db5bd8150a74ad2036f1037e6a0428df2
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun Aug 30 11:34:09 2015 -0700
Linux 4.2
This update is needed, as it turned out, that fastmap
was in experimental/broken state in kernel v3.15, which
was the last base for U-Boot.
Signed-off-by: Heiko Schocher <hs@denx.de>
Tested-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_ubi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c index 0460b4cc56..753a4dba3d 100644 --- a/common/cmd_ubi.c +++ b/common/cmd_ubi.c @@ -255,7 +255,7 @@ static int ubi_remove_vol(char *volume) return 0; out_err: - ubi_err("cannot remove volume %s, error %d", volume, err); + ubi_err(ubi, "cannot remove volume %s, error %d", volume, err); if (err < 0) err = -err; return err; @@ -284,8 +284,8 @@ static int ubi_volume_continue_write(char *volume, void *buf, size_t size) return -err; if (err) { - ubi_warn("volume %d on UBI device %d is corrupted", - vol->vol_id, ubi->ubi_num); + ubi_warn(ubi, "volume %d on UBI device %d is corrupt", + vol->vol_id, ubi->ubi_num); vol->corrupted = 1; } |
