diff options
| -rw-r--r-- | drivers/pinctrl/pinctrl-rockchip.c | 10 | 
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c index 8a3c582108c5..6c14f6c9c455 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -1262,6 +1262,10 @@ static int rockchip_pinctrl_register(struct platform_device *pdev,  		}  	} +	ret = rockchip_pinctrl_parse_dt(pdev, info); +	if (ret) +		return ret; +  	info->pctl_dev = pinctrl_register(ctrldesc, &pdev->dev, info);  	if (!info->pctl_dev) {  		dev_err(&pdev->dev, "could not register pinctrl driver\n"); @@ -1279,12 +1283,6 @@ static int rockchip_pinctrl_register(struct platform_device *pdev,  		pinctrl_add_gpio_range(info->pctl_dev, &pin_bank->grange);  	} -	ret = rockchip_pinctrl_parse_dt(pdev, info); -	if (ret) { -		pinctrl_unregister(info->pctl_dev); -		return ret; -	} -  	return 0;  }  | 
