ubi: wl: Silence uninitialized variable warning

Dan Carpenter · richardweinberger · commit 5578e48e5c0b · 2019-03-05T21:21:07.000+01:00
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: 663586c ("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>
diff --git 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.
 		 */

Original file line number	Diff line number	Diff line change
`@@ -1517,7 +1517,7 @@ int ubi_bitflip_check(struct ubi_device *ubi, int pnum, int force)`
`1517`	`1517`	`mutex_unlock(&ubi->buf_mutex);`
`1518`	`1518`	`}`
`1519`	`1519`
`1520`		`- if (err == UBI_IO_BITFLIPS \|\| force) {`
	`1520`	`+ if (force \|\| err == UBI_IO_BITFLIPS) {`
`1521`	`1521`	`/*`
`1522`	`1522`	`* Okay, bit flip happened, let's figure out what we can do.`
`1523`	`1523`	`*/`