diff options
Diffstat (limited to 'drivers/gpio/gpiolib.c')
-rw-r--r-- | drivers/gpio/gpiolib.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index a18f00fc1bb8..4e4c3083ae56 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c | |||
@@ -233,7 +233,7 @@ static struct gpio_desc *gpio_name_to_desc(const char * const name) | |||
233 | for (i = 0; i != chip->ngpio; ++i) { | 233 | for (i = 0; i != chip->ngpio; ++i) { |
234 | struct gpio_desc *gpio = &chip->desc[i]; | 234 | struct gpio_desc *gpio = &chip->desc[i]; |
235 | 235 | ||
236 | if (!gpio->name) | 236 | if (!gpio->name || !name) |
237 | continue; | 237 | continue; |
238 | 238 | ||
239 | if (!strcmp(gpio->name, name)) { | 239 | if (!strcmp(gpio->name, name)) { |
@@ -1279,7 +1279,13 @@ static int _gpiod_get_raw_value(const struct gpio_desc *desc) | |||
1279 | chip = desc->chip; | 1279 | chip = desc->chip; |
1280 | offset = gpio_chip_hwgpio(desc); | 1280 | offset = gpio_chip_hwgpio(desc); |
1281 | value = chip->get ? chip->get(chip, offset) : -EIO; | 1281 | value = chip->get ? chip->get(chip, offset) : -EIO; |
1282 | value = value < 0 ? value : !!value; | 1282 | /* |
1283 | * FIXME: fix all drivers to clamp to [0,1] or return negative, | ||
1284 | * then change this to: | ||
1285 | * value = value < 0 ? value : !!value; | ||
1286 | * so we can properly propagate error codes. | ||
1287 | */ | ||
1288 | value = !!value; | ||
1283 | trace_gpio_value(desc_to_gpio(desc), 1, value); | 1289 | trace_gpio_value(desc_to_gpio(desc), 1, value); |
1284 | return value; | 1290 | return value; |
1285 | } | 1291 | } |