Merge tag 'v4.4-rc6' into devel

Linux 4.4-rc6

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index e63bebc9ae60..d72ac1fdcd98 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -250,7 +250,7 @@ static struct gpio_desc *gpio_name_to_desc(const char * const name)
                 for (i = 0; i != chip->ngpio; ++i) {
                         struct gpio_desc *gpio = &chip->desc[i];
 
-                        if (!gpio->name)
+                        if (!gpio->name || !name)
                                 continue;
 
                         if (!strcmp(gpio->name, name)) {
@@ -1303,7 +1303,13 @@ static int _gpiod_get_raw_value(const struct gpio_desc *desc)
         chip = desc->chip;
         offset = gpio_chip_hwgpio(desc);
         value = chip->get ? chip->get(chip, offset) : -EIO;
-        value = value < 0 ? value : !!value;
+        /*
+         * FIXME: fix all drivers to clamp to [0,1] or return negative,
+         * then change this to:
+         * value = value < 0 ? value : !!value;
+         * so we can properly propagate error codes.
+         */
+        value = !!value;
         trace_gpio_value(desc_to_gpio(desc), 1, value);
         return value;
 }