diff options
| author |   Dan Carpenter <dan.carpenter@linaro.org> | 2025-07-15 18:01:19 -0500 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2025-07-17 18:37:14 -0700 |
| commit | c2fe3b2a7c71adccff9d7f651004405fa413bf17 (patch) | |
| tree | 5a95ec2f67e78545608ff1c26638993cdb44b025 | |
| parent | net: airoha: Fix a NULL vs IS_ERR() bug in airoha_npu_run_firmware() (diff) | |
| download | wireguard-linux-c2fe3b2a7c71adccff9d7f651004405fa413bf17.tar.xz wireguard-linux-c2fe3b2a7c71adccff9d7f651004405fa413bf17.zip | |
net: ethernet: mtk_wed: Fix NULL vs IS_ERR() bug in mtk_wed_get_memory_region()
We recently changed this from using devm_ioremap() to using
devm_ioremap_resource() and unfortunately the former returns NULL while
the latter returns error pointers. The check for errors needs to be
updated as well.
Fixes: e27dba1951ce ("net: Use of_reserved_mem_region_to_resource{_byname}() for "memory-region"")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/87c10dbd-df86-4971-b4f5-40ba02c076fb@sabinyo.mountain
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | drivers/net/ethernet/mediatek/mtk_wed_mcu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c index 8498b35ec7a6..fa6b21603416 100644 --- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c +++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c @@ -247,8 +247,10 @@ mtk_wed_get_memory_region(struct mtk_wed_hw *hw, const char *name, region->phy_addr = res.start; region->size = resource_size(&res); region->addr = devm_ioremap_resource(hw->dev, &res); + if (IS_ERR(region->addr)) + return PTR_ERR(region->addr); - return !region->addr ? -EINVAL : 0; + return 0; } static int |