summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2019-02-28 06:35:51 +0100
committerRichard Weinberger <richard@nod.at>2019-03-05 21:21:07 +0100
commit5578e48e5c0bf4684e68ae08caa2293bfb3f5307 (patch)
treebd138a3c79da25f6600069a24acc0d76502b47c0 /drivers/mtd
parentubifs: Reject unsupported ioctl flags explicitly (diff)
downloadlinux-5578e48e5c0bf4684e68ae08caa2293bfb3f5307.tar.xz
linux-5578e48e5c0bf4684e68ae08caa2293bfb3f5307.zip
ubi: wl: Silence uninitialized variable warning
This condition needs to be fipped around because "err" is uninitialized when "force" is set. The Smatch static analysis tool complains and UBsan will also complain at runtime. Fixes: 663586c0a892 ("ubi: Expose the bitrot interface") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Nathan Chancellor <natechancellor@gmail.com> Tested-by: Nathan Chancellor <natechancellor@gmail.com> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/ubi/wl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index 40f838d54b0f..2709dc02fc24 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -1517,7 +1517,7 @@ int ubi_bitflip_check(struct ubi_device *ubi, int pnum, int force)
mutex_unlock(&ubi->buf_mutex);
}
- if (err == UBI_IO_BITFLIPS || force) {
+ if (force || err == UBI_IO_BITFLIPS) {
/*
* Okay, bit flip happened, let's figure out what we can do.
*/