X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=drivers%2Fpinctrl%2Fpinctrl-adi2.c;h=c3c3d2345fc6b23b4364d952e75d8887772f7221;hb=d5fb82137b6cd39e67c4321f4f5ce9b03d4d04e6;hp=55f3d68419a60948d1de1f297e486bac63914ae7;hpb=93b6eb77b49064ed1de5726560a0849f3ebccc2c;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

diff --git a/drivers/pinctrl/pinctrl-adi2.c b/drivers/pinctrl/pinctrl-adi2.c
index 55f3d68419a6..c3c3d2345fc6 100644
--- a/drivers/pinctrl/pinctrl-adi2.c
+++ b/drivers/pinctrl/pinctrl-adi2.c
@@ -703,6 +703,7 @@ static struct pinmux_ops adi_pinmux_ops = {
 	.get_function_name = adi_pinmux_get_func_name,
 	.get_function_groups = adi_pinmux_get_groups,
 	.gpio_request_enable = adi_pinmux_request_gpio,
+	.strict = true,
 };
 
 
@@ -1069,9 +1070,9 @@ static int adi_pinctrl_probe(struct platform_device *pdev)
 
 	/* Now register the pin controller and all pins it handles */
 	pinctrl->pctl = pinctrl_register(&adi_pinmux_desc, &pdev->dev, pinctrl);
-	if (!pinctrl->pctl) {
+	if (IS_ERR(pinctrl->pctl)) {
 		dev_err(&pdev->dev, "could not register pinctrl ADI2 driver\n");
-		return -EINVAL;
+		return PTR_ERR(pinctrl->pctl);
 	}
 
 	platform_set_drvdata(pdev, pinctrl);