Skip to content

Commit

Permalink
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
torvalds committed Jan 12, 2016
2 parents 2945e9f + 4693c24 commit 19e2fc4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/m68k/coldfire/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 19e2fc4

Please sign in to comment.