Skip to content

Commit c2fe3b2

Browse files
Dan Carpenterkuba-moo
authored andcommitted
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: e27dba1 ("net: Use of_reserved_mem_region_to_resource{_byname}() for "memory-region"") Signed-off-by: Dan Carpenter <[email protected]> Acked-by: Lorenzo Bianconi <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 1e5e40f commit c2fe3b2

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/net/ethernet/mediatek/mtk_wed_mcu.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,10 @@ mtk_wed_get_memory_region(struct mtk_wed_hw *hw, const char *name,
247247
region->phy_addr = res.start;
248248
region->size = resource_size(&res);
249249
region->addr = devm_ioremap_resource(hw->dev, &res);
250+
if (IS_ERR(region->addr))
251+
return PTR_ERR(region->addr);
250252

251-
return !region->addr ? -EINVAL : 0;
253+
return 0;
252254
}
253255

254256
static int

0 commit comments

Comments
 (0)