diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-08 19:04:40 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-08 19:04:40 +0200 |
| commit | bf44ce8377316071fc53a1fe07b28f99a37c4462 (patch) | |
| tree | b8a41395e58f15a86d0e24cd9d0b4564f2d16cbb /drivers/pinctrl/pinctrl-sirf.c | |
| parent | Merge tag 'iommu-fixes-v3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | drivers/pinctrl/pinctrl-nomadik.c: drop devm_kfree of devm_kzalloc'd data (diff) | |
| download | linux-bf44ce8377316071fc53a1fe07b28f99a37c4462.tar.xz linux-bf44ce8377316071fc53a1fe07b28f99a37c4462.zip | |
Merge tag 'pinctrl-fixes-for-v3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pinctrl fixes from Linus Walleij:
- Move MXS pinctrl registration to poscore_initcall
- Fix up various devm_* managed resources code paths
- Fix one function group in the Nomadik driver
- Update MAINTAINERS
* tag 'pinctrl-fixes-for-v3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
drivers/pinctrl/pinctrl-nomadik.c: drop devm_kfree of devm_kzalloc'd data
MAINTAINERS: fix a few pinctrl related entries
pinctrl-sirf: remove devm_kfree at error path
pinctrl/nomadik: fix hsi function group list
pinctrl/pinctrl-u300: remove unneeded devm_kfree call
pinctrl: mxs: register driver at postcore_initcall time
Diffstat (limited to 'drivers/pinctrl/pinctrl-sirf.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-sirf.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-sirf.c b/drivers/pinctrl/pinctrl-sirf.c index 2aae8a8978e9..7fca6ce5952b 100644 --- a/drivers/pinctrl/pinctrl-sirf.c +++ b/drivers/pinctrl/pinctrl-sirf.c @@ -1217,7 +1217,6 @@ out_no_rsc_remap: iounmap(spmx->gpio_virtbase); out_no_gpio_remap: platform_set_drvdata(pdev, NULL); - devm_kfree(&pdev->dev, spmx); return ret; } |