From: Vladimir Zapolskiy Date: Wed, 23 Mar 2016 02:52:45 +0000 (+0200) Subject: misc: sram: fix check of devm_ioremap*() return value X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d449d69d216854a8cab049fe035ffefbf383a2e1;p=openwrt%2Fstaging%2Fblogic.git misc: sram: fix check of devm_ioremap*() return value Both devm_ioremap() and devm_ioremap_wc() functions return either a pointer to valid iomem region or NULL, check for IS_ERR() is improper and may result in oops on error path. Now on error -ENOMEM is returned. Fixes: 0ab163ad1ea0 ("misc: sram: switch to ioremap_wc from ioremap") Signed-off-by: Vladimir Zapolskiy Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/misc/sram.c b/drivers/misc/sram.c index 69cdabea9c03..f84b53d6ce50 100644 --- a/drivers/misc/sram.c +++ b/drivers/misc/sram.c @@ -364,8 +364,8 @@ static int sram_probe(struct platform_device *pdev) sram->virt_base = devm_ioremap(sram->dev, res->start, size); else sram->virt_base = devm_ioremap_wc(sram->dev, res->start, size); - if (IS_ERR(sram->virt_base)) - return PTR_ERR(sram->virt_base); + if (!sram->virt_base) + return -ENOMEM; sram->pool = devm_gen_pool_create(sram->dev, ilog2(SRAM_GRANULARITY), NUMA_NO_NODE, NULL);