diff options
| author |   Johan Hovold <johan@kernel.org> | 2015-01-12 17:20:51 +0100 |
|---|---|---|
| committer |   Linus Walleij <linus.walleij@linaro.org> | 2015-01-14 14:20:46 +0100 |
| commit | 41f632fe177bc4822c2e8236fe7c291e6e9eb6f8 (patch) | |
| tree | 50acc3e7d69af93e7bc893b6c5704b4d2031ecaa /drivers/pinctrl/pinctrl-xway.c | |
| parent | pinctrl: Fix two deadlocks (diff) | |
| download | linux-dev-41f632fe177bc4822c2e8236fe7c291e6e9eb6f8.tar.xz linux-dev-41f632fe177bc4822c2e8236fe7c291e6e9eb6f8.zip | |
pinctrl: lantiq: remove bogus of_gpio_chip_add
Remove bogus call to of_gpiochip_add (and of_gpio_chip remove in error
path) which is also called when adding the gpio chip.
This prevents adding the same pinctrl range twice.
Fixes: 3f8c50c9b110 ("OF: pinctrl: MIPS: lantiq: implement lantiq/xway
pinctrl support")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-xway.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-xway.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c index c5cef59f5965..779950c62e53 100644 --- a/drivers/pinctrl/pinctrl-xway.c +++ b/drivers/pinctrl/pinctrl-xway.c @@ -798,10 +798,8 @@ static int pinmux_xway_probe(struct platform_device *pdev) /* load the gpio chip */ xway_chip.dev = &pdev->dev; - of_gpiochip_add(&xway_chip); ret = gpiochip_add(&xway_chip); if (ret) { - of_gpiochip_remove(&xway_chip); dev_err(&pdev->dev, "Failed to register gpio chip\n"); return ret; } |