diff options
| author |   Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2016-06-18 17:26:07 +0000 |
|---|---|---|
| committer |   Lee Jones <lee.jones@linaro.org> | 2016-06-29 10:16:32 +0100 |
| commit | 7e28abda8c1f08e8926ed1b9fbfb6efdfc88c19b (patch) | |
| tree | 8aa9219f3789d05f0135b143870af3ad11a136fb /drivers/mfd | |
| parent | mfd: smsc-ece1099: Return directly after a function failure in smsc_i2c_probe() (diff) | |
| download | linux-dev-7e28abda8c1f08e8926ed1b9fbfb6efdfc88c19b.tar.xz linux-dev-7e28abda8c1f08e8926ed1b9fbfb6efdfc88c19b.zip | |
mfd: hi655x: Fix return value check in hi655x_pmic_probe()
In case of error, the function devm_ioremap_resource() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR(). Also remove unneeded error handling of
platform_get_resource().
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/hi655x-pmic.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mfd/hi655x-pmic.c b/drivers/mfd/hi655x-pmic.c index e955a0c6f40b..0fc62995695b 100644 --- a/drivers/mfd/hi655x-pmic.c +++ b/drivers/mfd/hi655x-pmic.c @@ -105,12 +105,9 @@ static int hi655x_pmic_probe(struct platform_device *pdev) pmic->dev = dev; pmic->res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!pmic->res) - return -ENOENT; - base = devm_ioremap_resource(dev, pmic->res); - if (!base) - return -ENOMEM; + if (IS_ERR(base)) + return PTR_ERR(base); pmic->regmap = devm_regmap_init_mmio_clk(dev, NULL, base, &hi655x_regmap_config); |