]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: ethernet: mtk_wed: Fix NULL vs IS_ERR() bug in mtk_wed_get_memory_region()
authorDan Carpenter <dan.carpenter@linaro.org>
Tue, 15 Jul 2025 23:01:19 +0000 (18:01 -0500)
committerJakub Kicinski <kuba@kernel.org>
Fri, 18 Jul 2025 01:37:14 +0000 (18:37 -0700)
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>
drivers/net/ethernet/mediatek/mtk_wed_mcu.c

index 8498b35ec7a6a88bb62be09865fc5ba64cebf02f..fa6b2160341692cc12edb4fa8a78caa24dbe6275 100644 (file)
@@ -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