projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ath79: add support for reset key on MikroTik RB912UAG-2HPnD
[openwrt/openwrt.git]
/
target
/
linux
/
ath79
/
files
/
drivers
/
gpio
/
gpio-latch.c
diff --git
a/target/linux/ath79/files/drivers/gpio/gpio-latch.c
b/target/linux/ath79/files/drivers/gpio/gpio-latch.c
index f3545a663e0d023eceba3637b4f223971fc7aa48..976e68323083a66bd6b086ceaa12af6d5202ba07 100644
(file)
--- a/
target/linux/ath79/files/drivers/gpio/gpio-latch.c
+++ b/
target/linux/ath79/files/drivers/gpio/gpio-latch.c
@@
-62,7
+62,7
@@
gpio_latch_get(struct gpio_chip *gc, unsigned offset)
int ret;
gpio_latch_lock(glc, false);
int ret;
gpio_latch_lock(glc, false);
- ret = gpiod_get_
value
(glc->gpios[offset]);
+ ret = gpiod_get_
raw_value_cansleep
(glc->gpios[offset]);
gpio_latch_unlock(glc, false);
return ret;
gpio_latch_unlock(glc, false);
return ret;
@@
-81,7
+81,7
@@
gpio_latch_set(struct gpio_chip *gc, unsigned offset, int value)
}
gpio_latch_lock(glc, enable_latch);
}
gpio_latch_lock(glc, enable_latch);
- gpiod_set_raw_value(glc->gpios[offset], value);
+ gpiod_set_raw_value
_cansleep
(glc->gpios[offset], value);
gpio_latch_unlock(glc, disable_latch);
}
gpio_latch_unlock(glc, disable_latch);
}
@@
-133,8
+133,10
@@
static int gpio_latch_probe(struct platform_device *pdev)
glc->gpios[i] = devm_gpiod_get_index_optional(dev, NULL, i,
GPIOD_OUT_LOW);
if (IS_ERR(glc->gpios[i])) {
glc->gpios[i] = devm_gpiod_get_index_optional(dev, NULL, i,
GPIOD_OUT_LOW);
if (IS_ERR(glc->gpios[i])) {
- dev_err(dev, "failed to get gpio %d: %d\n", i,
- PTR_ERR(glc->gpios[i]));
+ if (PTR_ERR(glc->gpios[i]) != -EPROBE_DEFER) {
+ dev_err(dev, "failed to get gpio %d: %d\n", i,
+ PTR_ERR(glc->gpios[i]));
+ }
return PTR_ERR(glc->gpios[i]);
}
}
return PTR_ERR(glc->gpios[i]);
}
}