Commit 19e2fc40 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://

Pull m68knommu update from Greg Ungerer:
 "Only a single change, limiting the return values for coldfire gpio get

* 'for-next' of git://
  m68k: coldfire/gpio: Be sure to clamp return value
parents 2945e9f1 4693c249
......@@ -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,
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment