summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/pinctrl-xway.c
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2015-01-26 13:42:49 +0100
committerJoerg Roedel <jroedel@suse.de>2015-01-26 13:42:49 +0100
commitfd47b693c3c694da8210b5a0c01b1e379f4d9865 (patch)
tree84d8c5596df7f6eb295ac380b8ddb983af6c906d /drivers/pinctrl/pinctrl-xway.c
parentMerge branch 'iommu/next' of git://linuxtv.org/pinchartl/fbdev into arm/renesas (diff)
parentMerge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/lin... (diff)
downloadlinux-fd47b693c3c694da8210b5a0c01b1e379f4d9865.tar.xz
linux-fd47b693c3c694da8210b5a0c01b1e379f4d9865.zip
Merge branch 'arm/smmu' into arm/renesas
Diffstat (limited to 'drivers/pinctrl/pinctrl-xway.c')
-rw-r--r--drivers/pinctrl/pinctrl-xway.c2
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;
}