mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
|
From 04231c61dcd51db0f12061e49bb761b197109f2f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
||
|
|
Date: Thu, 29 Feb 2024 03:47:24 +0000
|
||
|
|
Subject: [PATCH 8/8] mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems
|
||
|
|
|
||
|
|
A compiler warning related to sizeof(int) != 8 when calling do_div()
|
||
|
|
is triggered when building on 32-bit platforms.
|
||
|
|
Address this by using integer types having a well-defined size.
|
||
|
|
|
||
|
|
Fixes: 3ce485803da1 ("mtd: ubi: provide NVMEM layer over UBI volumes")
|
||
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||
|
|
Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
|
||
|
|
Tested-by: Randy Dunlap <rdunlap@infradead.org>
|
||
|
|
Signed-off-by: Richard Weinberger <richard@nod.at>
|
||
|
|
---
|
||
|
|
drivers/mtd/ubi/nvmem.c | 5 ++++-
|
||
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
--- a/drivers/mtd/ubi/nvmem.c
|
||
|
|
+++ b/drivers/mtd/ubi/nvmem.c
|
||
|
|
@@ -23,9 +23,12 @@ struct ubi_nvmem {
|
||
|
|
static int ubi_nvmem_reg_read(void *priv, unsigned int from,
|
||
|
|
void *val, size_t bytes)
|
||
|
|
{
|
||
|
|
- int err = 0, lnum = from, offs, bytes_left = bytes, to_read;
|
||
|
|
+ size_t to_read, bytes_left = bytes;
|
||
|
|
struct ubi_nvmem *unv = priv;
|
||
|
|
struct ubi_volume_desc *desc;
|
||
|
|
+ uint32_t offs;
|
||
|
|
+ uint64_t lnum = from;
|
||
|
|
+ int err = 0;
|
||
|
|
|
||
|
|
desc = ubi_open_volume(unv->ubi_num, unv->vol_id, UBI_READONLY);
|
||
|
|
if (IS_ERR(desc))
|