diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-12 21:45:33 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-12 21:45:33 +0300 |
| commit | 21d2f8dc91e4eb987999092aabbb5f8409a1ab50 (patch) | |
| tree | b041979874b32905847d1ce5f6498b0b63b84518 /drivers/gpio/gpio-msic.c | |
| parent | c8dfbf48d3dd4e96044f2fa04fb5f58239e44c31 (diff) | |
| parent | d6a2b7ba67334a7e72cd153c142c449831557cb9 (diff) | |
| download | linux-3.10-21d2f8dc91e4eb987999092aabbb5f8409a1ab50.tar.gz linux-3.10-21d2f8dc91e4eb987999092aabbb5f8409a1ab50.tar.bz2 linux-3.10-21d2f8dc91e4eb987999092aabbb5f8409a1ab50.zip | |
Merge tag 'gpio-fixes-v3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
Pull gpio fixes from Linus Walleij:
- Fix a resource leak in the SCH driver
- Fix the register address calculation in the MSIC driver
- Fix the PXA driver's devicetree functions
- Delete redundant shadow variable leftovers in the MXC driver
- Specify the GPIO base for the device tree probe in the MXC driver
- Add a modalias for the i.MX driver
- Fix off-by-one bug in the Samsung driver
- Fix erroneous errorpath in the Langwell driver
* tag 'gpio-fixes-v3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
drivers/gpio/gpio-langwell.c: fix error return code
gpio: samsung: Fix off-by-one bug in gpio addresses
ARM: dts: imx: add alias for gpio
gpio/mxc: specify gpio base for device tree probe
gpio/mxc: remove redundant shadow variables initialization
GPIO: gpio-pxa: fix devicetree functions
gpio: msic: Fix calculating register address in msic_gpio_to_oreg()
gpio-sch: Fix leak of resource
Diffstat (limited to 'drivers/gpio/gpio-msic.c')
| -rw-r--r-- | drivers/gpio/gpio-msic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-msic.c b/drivers/gpio/gpio-msic.c index 71a838f4450..b3898628586 100644 --- a/drivers/gpio/gpio-msic.c +++ b/drivers/gpio/gpio-msic.c @@ -99,7 +99,7 @@ static int msic_gpio_to_oreg(unsigned offset) if (offset < 20) return INTEL_MSIC_GPIO0HV0CTLO - offset + 16; - return INTEL_MSIC_GPIO1HV0CTLO + offset + 20; + return INTEL_MSIC_GPIO1HV0CTLO - offset + 20; } static int msic_gpio_direction_input(struct gpio_chip *chip, unsigned offset) |