aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorDevendra Naga <devendra.aaru@gmail.com>2012-06-09 08:02:31 -0400
committerLinus Walleij <linus.walleij@linaro.org>2012-06-12 10:26:08 -0400
commit149ff9e1f240e7b57a02e0be5f74f21d0307d1d3 (patch)
tree8f9f4eaeec806671e87eac9283908c13c05b50d3 /drivers/pinctrl
parent0bf7481852c8ece4888c299ba0259b789c3dbde3 (diff)
pinctrl: pinctrl-mxs: set platform driver data to NULL at errpath and at unregister
clear the platform data pointer when mxs_pinctrl_probe_dt fails, and also before the unregistering with pinctrl subsystem. Signed-off-by: Devendra Naga <devendra.aaru@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/pinctrl-mxs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pinctrl/pinctrl-mxs.c b/drivers/pinctrl/pinctrl-mxs.c
index 9d46303a84e7..afb50ee64598 100644
--- a/drivers/pinctrl/pinctrl-mxs.c
+++ b/drivers/pinctrl/pinctrl-mxs.c
@@ -516,6 +516,7 @@ int __devinit mxs_pinctrl_probe(struct platform_device *pdev,
516 return 0; 516 return 0;
517 517
518err: 518err:
519 platform_set_drvdata(pdev, NULL);
519 iounmap(d->base); 520 iounmap(d->base);
520 return ret; 521 return ret;
521} 522}
@@ -525,6 +526,7 @@ int __devexit mxs_pinctrl_remove(struct platform_device *pdev)
525{ 526{
526 struct mxs_pinctrl_data *d = platform_get_drvdata(pdev); 527 struct mxs_pinctrl_data *d = platform_get_drvdata(pdev);
527 528
529 platform_set_drvdata(pdev, NULL);
528 pinctrl_unregister(d->pctl); 530 pinctrl_unregister(d->pctl);
529 iounmap(d->base); 531 iounmap(d->base);
530 532