summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2025-01-29 08:10:45 -0600
committerTom Rini <trini@konsulko.com>2025-01-29 08:10:45 -0600
commit75125f392de4e672127fe0b092d481e78ff8bdd0 (patch)
tree0f5b73deef27f6df9d9777ce93a7e445a7628251
parentecbd635367ffb6af3e7f015d07e5f6de13c6d902 (diff)
parent14e02d6c6180f85114cc0a90469e010a5d68b2ee (diff)
Merge tag 'ubifixes-for-2025.01-rc2' of https://source.denx.de/u-boot/custodians/u-boot-ubi
CI: https://dev.azure.com/hs0298/hs/_build/results?buildId=169&view=results ubi changes for v2025.01-rc2 - ubifs: Remove unnecessary assignment from Michal Simek
-rw-r--r--fs/ubifs/recovery.c1
-rw-r--r--fs/ubifs/scan.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c
index 6b6884fb209..12c0575cc97 100644
--- a/fs/ubifs/recovery.c
+++ b/fs/ubifs/recovery.c
@@ -439,7 +439,6 @@ static void clean_buf(const struct ubifs_info *c, void **buf, int lnum,
{
int empty_offs, pad_len;
- lnum = lnum;
dbg_rcvry("cleaning corruption at %d:%d", lnum, *offs);
ubifs_assert(!(*offs & 7));
diff --git a/fs/ubifs/scan.c b/fs/ubifs/scan.c
index 7a6e46df5d9..2335e9e2d25 100644
--- a/fs/ubifs/scan.c
+++ b/fs/ubifs/scan.c
@@ -169,7 +169,6 @@ struct ubifs_scan_leb *ubifs_start_scan(const struct ubifs_info *c, int lnum,
void ubifs_end_scan(const struct ubifs_info *c, struct ubifs_scan_leb *sleb,
int lnum, int offs)
{
- lnum = lnum;
dbg_scan("stop scanning LEB %d at offset %d", lnum, offs);
ubifs_assert(offs % c->min_io_size == 0);