Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

[deliverable/linux.git] / drivers / pinctrl / pinctrl-tegra.c

diff --git a/drivers/pinctrl/pinctrl-tegra.c b/drivers/pinctrl/pinctrl-tegra.c
index b6934867d8d3ef51b8c4baa84b72878a2175a6da..ae52e4e5d098cc57d31c9ae8dbd478c05601db1f 100644 (file)
--- a/drivers/pinctrl/pinctrl-tegra.c
+++ b/drivers/pinctrl/pinctrl-tegra.c
@@ -745,9 +745,9 @@ int __devinit tegra_pinctrl_probe(struct platform_device *pdev,
        }
 
        pmx->pctl = pinctrl_register(&tegra_pinctrl_desc, &pdev->dev, pmx);
-       if (IS_ERR(pmx->pctl)) {
+       if (!pmx->pctl) {
                dev_err(&pdev->dev, "Couldn't register pinctrl driver\n");
-               return PTR_ERR(pmx->pctl);
+               return -ENODEV;
        }
 
        pinctrl_add_gpio_range(pmx->pctl, &tegra_pinctrl_gpio_range);
@@ -764,7 +764,6 @@ int __devexit tegra_pinctrl_remove(struct platform_device *pdev)
 {
        struct tegra_pmx *pmx = platform_get_drvdata(pdev);
 
-       pinctrl_remove_gpio_range(pmx->pctl, &tegra_pinctrl_gpio_range);
        pinctrl_unregister(pmx->pctl);
 
        return 0;