aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/sta2x11-mfd.c
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-12-07 01:03:00 -0500
committerLee Jones <lee.jones@linaro.org>2014-01-21 03:28:03 -0500
commitec9e4ba67e3782d5a9ec12754223a3f611810a93 (patch)
tree160e7a2be128bf844878a1ebc12a9ae87886de8e /drivers/mfd/sta2x11-mfd.c
parent328fe79cac65331cbf22c8eefcb2a1f9164974ac (diff)
mfd: sta2x11-mfd: Fix return value check in sta2x11_mfd_platform_probe()
In case of error, the function devm_regmap_init_mmio() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/sta2x11-mfd.c')
-rw-r--r--drivers/mfd/sta2x11-mfd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/sta2x11-mfd.c b/drivers/mfd/sta2x11-mfd.c
index 53ab686c984f..0d42e40adb98 100644
--- a/drivers/mfd/sta2x11-mfd.c
+++ b/drivers/mfd/sta2x11-mfd.c
@@ -339,7 +339,7 @@ static int sta2x11_mfd_platform_probe(struct platform_device *dev,
339 regmap_config->cache_type = REGCACHE_NONE; 339 regmap_config->cache_type = REGCACHE_NONE;
340 mfd->regmap[index] = devm_regmap_init_mmio(&dev->dev, mfd->regs[index], 340 mfd->regmap[index] = devm_regmap_init_mmio(&dev->dev, mfd->regs[index],
341 regmap_config); 341 regmap_config);
342 WARN_ON(!mfd->regmap[index]); 342 WARN_ON(IS_ERR(mfd->regmap[index]));
343 343
344 return 0; 344 return 0;
345} 345}