diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-13 00:16:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-13 00:16:31 +0200 |
| commit | d7a02fa0a8f9ec1b81d57628ca9834563208ef33 (patch) | |
| tree | b2f43dbee43b7abd7329b8745e4f0a9659ee6ffe /drivers/mtd | |
| parent | Merge tag 'mtd/for-5.2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | ubi: wl: Fix uninitialized variable (diff) | |
| download | linux-d7a02fa0a8f9ec1b81d57628ca9834563208ef33.tar.xz linux-d7a02fa0a8f9ec1b81d57628ca9834563208ef33.zip | |
Merge tag 'upstream-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/ubifs
Pull UBI/UBIFS updates from Richard Weinberger:
- fscrypt framework usage updates
- One huge fix for xattr unlink
- Cleanup of fscrypt ifdefs
- Fix for our new UBIFS auth feature
* tag 'upstream-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
ubi: wl: Fix uninitialized variable
ubifs: Drop unnecessary setting of zbr->znode
ubifs: Remove ifdefs around CONFIG_UBIFS_ATIME_SUPPORT
ubifs: Remove #ifdef around CONFIG_FS_ENCRYPTION
ubifs: Limit number of xattrs per inode
ubifs: orphan: Handle xattrs like files
ubifs: journal: Handle xattrs like files
ubifs: find.c: replace swap function with built-in one
ubifs: Do not skip hash checking in data nodes
ubifs: work around high stack usage with clang
ubifs: remove unused function __ubifs_shash_final
ubifs: remove unnecessary #ifdef around fscrypt_ioctl_get_policy()
ubifs: remove unnecessary calls to set up directory key
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/ubi/wl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c index 2709dc02fc24..1f56c655832b 100644 --- a/drivers/mtd/ubi/wl.c +++ b/drivers/mtd/ubi/wl.c @@ -1475,7 +1475,7 @@ static bool scrub_possible(struct ubi_device *ubi, struct ubi_wl_entry *e) */ int ubi_bitflip_check(struct ubi_device *ubi, int pnum, int force) { - int err; + int err = 0; struct ubi_wl_entry *e; if (pnum < 0 || pnum >= ubi->peb_count) { |