Jelajahi Sumber

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
Linus Torvalds 9 tahun lalu
induk
melakukan
19e2fc4066
1 mengubah file dengan 1 tambahan dan 1 penghapusan
  1. 1 1
      arch/m68k/coldfire/gpio.c

+ 1 - 1
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)
 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,
 static int mcfgpio_direction_output(struct gpio_chip *chip, unsigned offset,