diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-10-30 11:09:15 +0800 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-10-30 11:28:14 -0700 |
| commit | 9a4864c897549e048b582372eca36e967b87784c (patch) | |
| tree | 077f110365c4ace7a33238cd26e0023dcf3a1272 /drivers/gpio | |
| parent | 85aa391528ad11bfdfa5e5dec1f3e91cfe8ab078 (diff) | |
| download | linux-stable-9a4864c897549e048b582372eca36e967b87784c.tar.gz linux-stable-9a4864c897549e048b582372eca36e967b87784c.tar.bz2 linux-stable-9a4864c897549e048b582372eca36e967b87784c.zip | |
gpio: tb10x: fix return value check in tb10x_gpio_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 the dev_err call to avoid redundant
error message.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-tb10x.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-tb10x.c b/drivers/gpio/gpio-tb10x.c index af4975c20d85..0502b9a041a5 100644 --- a/drivers/gpio/gpio-tb10x.c +++ b/drivers/gpio/gpio-tb10x.c @@ -207,10 +207,8 @@ static int tb10x_gpio_probe(struct platform_device *pdev) spin_lock_init(&tb10x_gpio->spinlock); tb10x_gpio->base = devm_ioremap_resource(&pdev->dev, mem); - if (!tb10x_gpio->base) { - dev_err(&pdev->dev, "Could not remap reg space.\n"); - goto fail_ioremap; - } + if (IS_ERR(tb10x_gpio->base)) + return PTR_ERR(tb10x_gpio->base); tb10x_gpio->gc.label = of_node_full_name(dn); tb10x_gpio->gc.dev = &pdev->dev; |