summaryrefslogtreecommitdiff
path: root/drivers/pinctrl/meson
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-09-23 14:57:16 +0200
committerLinus Walleij <linus.walleij@linaro.org>2016-09-23 14:57:16 +0200
commit0565f49cfe937640c2347f6d7f40ad2f4e4f088b (patch)
tree6067447df39c37946bc2de3ee004f45957bf123e /drivers/pinctrl/meson
parentccf1e9e1c0072088420aad42797986d6e74366b5 (diff)
parent9395452b4aab7bc2475ef8935b4a4fb99d778d70 (diff)
Merge tag 'v4.8-rc6' into devel
Linux 4.8-rc6
Diffstat (limited to 'drivers/pinctrl/meson')
-rw-r--r--drivers/pinctrl/meson/pinctrl-meson.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
index 9678599cc774..57122eda155a 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.c
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
@@ -679,13 +679,7 @@ static int meson_pinctrl_probe(struct platform_device *pdev)
return PTR_ERR(pc->pcdev);
}
- ret = meson_gpiolib_register(pc);
- if (ret) {
- pinctrl_unregister(pc->pcdev);
- return ret;
- }
-
- return 0;
+ return meson_gpiolib_register(pc);
}
static struct platform_driver meson_pinctrl_driver = {