diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-22 15:21:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-22 15:21:48 +0200 |
| commit | 7cf0f1426a909ed36a8b349a4a975e0d68b5edad (patch) | |
| tree | 0700bb26ceeefb95efc13c3247c04fe7207b509e /drivers/pinctrl/meson/pinctrl-meson.c | |
| parent | c907420fdaec78b17f59a6011cb5f9d6051c6a35 (diff) | |
| parent | 9bf6ffdabdd6e70a0b69d032a0aff091afe1773e (diff) | |
Merge branch 'locking/urgent' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/pinctrl/meson/pinctrl-meson.c')
| -rw-r--r-- | drivers/pinctrl/meson/pinctrl-meson.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index 11623c6b0cb3..44e69c963f5d 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -727,13 +727,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 = { |