aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/pinctrl-rockchip.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-11-08 05:01:38 -0500
committerLinus Walleij <linus.walleij@linaro.org>2013-11-25 03:08:18 -0500
commit38d321c899457be111f1a1bcd8c8d1ca18772072 (patch)
tree41c47ed30c41fd7e65984df0179b12a0b58c6f19 /drivers/pinctrl/pinctrl-rockchip.c
parent6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff)
pinctrl: rockchip: testing the wrong variable
There is a copy and paste bug so we test "info->reg_base" instead of "info->reg_pull". Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-rockchip.c')
-rw-r--r--drivers/pinctrl/pinctrl-rockchip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
index e939c28cbf1f..fe2ec1bdf56e 100644
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -1453,8 +1453,8 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)
1453 if (ctrl->type == RK3188) { 1453 if (ctrl->type == RK3188) {
1454 res = platform_get_resource(pdev, IORESOURCE_MEM, 1); 1454 res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
1455 info->reg_pull = devm_ioremap_resource(&pdev->dev, res); 1455 info->reg_pull = devm_ioremap_resource(&pdev->dev, res);
1456 if (IS_ERR(info->reg_base)) 1456 if (IS_ERR(info->reg_pull))
1457 return PTR_ERR(info->reg_base); 1457 return PTR_ERR(info->reg_pull);
1458 } 1458 }
1459 1459
1460 ret = rockchip_gpiolib_register(pdev, info); 1460 ret = rockchip_gpiolib_register(pdev, info);