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,
         return 0;
 
 err:
+        platform_set_drvdata(pdev, NULL);
         iounmap(d->base);
         return ret;
 }
@@ -525,6 +526,7 @@ int __devexit mxs_pinctrl_remove(struct platform_device *pdev)
 {
         struct mxs_pinctrl_data *d = platform_get_drvdata(pdev);
 
+        platform_set_drvdata(pdev, NULL);
         pinctrl_unregister(d->pctl);
         iounmap(d->base);