diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-05 08:04:29 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-05 08:04:29 -0700 |
commit | 5e6c72396c2c514a761d990011ce1560f0eb71c9 (patch) | |
tree | 99ccd36c79fee77d9a7187b3c63aa6256f5dd30a /drivers | |
parent | caa552358eb3de5d1cb0f473e92c91d8a875b7f3 (diff) | |
parent | 0dbc8b7afef6e4fddcfebcbacbeb269a0a3b06d5 (diff) | |
download | linux-5e6c72396c2c514a761d990011ce1560f0eb71c9.tar.bz2 |
Merge tag 'gpio-v3.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
Pull GPIO fixes from Linus Walleij:
- some documentation sync
- resource leak in the bt8xx driver
- again fix the way varargs are used to handle the optional flags on
the gpiod_* accessors. Now hopefully nailed the entire problem.
* tag 'gpio-v3.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
gpio: move varargs hack outside #ifdef GPIOLIB
gpio: bt8xx: fix release of managed resources
Documentation: gpio: documentation for optional getters functions
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpio/gpio-bt8xx.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpio/gpio-bt8xx.c b/drivers/gpio/gpio-bt8xx.c index 6557147d9331..7e4c43c18960 100644 --- a/drivers/gpio/gpio-bt8xx.c +++ b/drivers/gpio/gpio-bt8xx.c @@ -241,9 +241,6 @@ static void bt8xxgpio_remove(struct pci_dev *pdev) bgwrite(~0x0, BT848_INT_STAT); bgwrite(0x0, BT848_GPIO_OUT_EN); - iounmap(bg->mmio); - release_mem_region(pci_resource_start(pdev, 0), - pci_resource_len(pdev, 0)); pci_disable_device(pdev); } |