projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
pinctrl
/
pinctrl-mxs.c
diff --git
a/drivers/pinctrl/pinctrl-mxs.c
b/drivers/pinctrl/pinctrl-mxs.c
index b45c4eb357988beaa0091835e45e09c46209ac76..f5d56436ba7f838d77e78deb526178944c8efa35 100644
(file)
--- a/
drivers/pinctrl/pinctrl-mxs.c
+++ b/
drivers/pinctrl/pinctrl-mxs.c
@@
-515,7
+515,6
@@
int mxs_pinctrl_probe(struct platform_device *pdev,
return 0;
err:
- platform_set_drvdata(pdev, NULL);
iounmap(d->base);
return ret;
}
@@
-525,7
+524,6
@@
int 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);