diff options
| author |   Vladimir Zapolskiy <vz@mleia.com> | 2016-03-23 04:52:45 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-30 14:15:56 -0700 |
| commit | d449d69d216854a8cab049fe035ffefbf383a2e1 (patch) | |
| tree | fd01a23fe64c363f34753c5e5cd8ad5ad68c8ff8 /drivers/misc/sram.c | |
| parent | spmi: do not use bus internal data (diff) | |
| download | linux-dev-d449d69d216854a8cab049fe035ffefbf383a2e1.tar.xz linux-dev-d449d69d216854a8cab049fe035ffefbf383a2e1.zip | |
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 <vz@mleia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/sram.c')
| -rw-r--r-- | drivers/misc/sram.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |