diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-12 10:34:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-12 10:34:43 -0800 |
| commit | 19e2fc4066d7e63e47adb6a70c77ba7d291b1972 (patch) | |
| tree | f57bf5985180bf4661223acbd77672aa30ca70f1 /arch/m68k | |
| parent | 2945e9f111e2f5f7d7b0f4af0a56b9f768db9fc8 (diff) | |
| parent | 4693c2493a9b2d0c5d407496ea107676a690f1c0 (diff) | |
| download | linux-19e2fc4066d7e63e47adb6a70c77ba7d291b1972.tar.bz2 | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu update from Greg Ungerer:
"Only a single change, limiting the return values for coldfire gpio get
function"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: coldfire/gpio: Be sure to clamp return value
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/coldfire/gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/coldfire/gpio.c b/arch/m68k/coldfire/gpio.c index e7e428681ec5..37a83e27c7a6 100644 --- a/arch/m68k/coldfire/gpio.c +++ b/arch/m68k/coldfire/gpio.c @@ -121,7 +121,7 @@ static int mcfgpio_direction_input(struct gpio_chip *chip, unsigned offset) static int mcfgpio_get_value(struct gpio_chip *chip, unsigned offset) { - return __mcfgpio_get_value(offset); + return !!__mcfgpio_get_value(offset); } static int mcfgpio_direction_output(struct gpio_chip *chip, unsigned offset, |