Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / pinctrl-lantiq.c

diff --git a/drivers/pinctrl/pinctrl-lantiq.c b/drivers/pinctrl/pinctrl-lantiq.c
index 296e5b37f7682ac765dc78ef33edbbf93abfab2c..fc38a85405444316d0f62904be77734f44c35318 100644 (file)
--- a/drivers/pinctrl/pinctrl-lantiq.c
+++ b/drivers/pinctrl/pinctrl-lantiq.c
@@ -337,9 +337,9 @@ int ltq_pinctrl_register(struct platform_device *pdev,
        info->dev = &pdev->dev;
 
        info->pctrl = pinctrl_register(desc, &pdev->dev, info);
-       if (!info->pctrl) {
+       if (IS_ERR(info->pctrl)) {
                dev_err(&pdev->dev, "failed to register LTQ pinmux driver\n");
-               return -EINVAL;
+               return PTR_ERR(info->pctrl);
        }
        platform_set_drvdata(pdev, info);
        return 0;