[PATCH 2/3] Input: rotary_encoder - fix device tree error handling
flat view
STALE3925d
From: Timo Teräs <hidden>
Date: 2016-01-15 20:33:57
Subsystem:
input (keyboard, mouse, joystick, touchscreen) drivers, the rest · Maintainers:
Dmitry Torokhov, Linus Torvalds
of_get_gpio_flags() can fail, so pass through the error code properly. Most important use case is when it returns EPROBE_DEFER so that the probe gets called again later. Signed-off-by: Timo Teräs <redacted> --- drivers/input/misc/rotary_encoder.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c
index 0f23d32..156f40f 100644
--- a/drivers/input/misc/rotary_encoder.c
+++ b/drivers/input/misc/rotary_encoder.c@@ -206,7 +206,7 @@ static struct rotary_encoder_platform_data *rotary_encoder_parse_dt(struct devic struct device_node *np = dev->of_node; struct rotary_encoder_platform_data *pdata; enum of_gpio_flags flags; - int error; + int ret; if (!of_id || !np) return NULL;
@@ -219,19 +219,25 @@ static struct rotary_encoder_platform_data *rotary_encoder_parse_dt(struct devic of_property_read_u32(np, "rotary-encoder,steps", &pdata->steps); of_property_read_u32(np, "linux,axis", &pdata->axis); - pdata->gpio_a = of_get_gpio_flags(np, 0, &flags); + ret = of_get_gpio_flags(np, 0, &flags); + if (ret < 0) + return ERR_PTR(ret); + pdata->gpio_a = ret; pdata->inverted_a = flags & OF_GPIO_ACTIVE_LOW; - pdata->gpio_b = of_get_gpio_flags(np, 1, &flags); + ret = of_get_gpio_flags(np, 1, &flags); + if (ret < 0) + return ERR_PTR(ret); + pdata->gpio_b = ret; pdata->inverted_b = flags & OF_GPIO_ACTIVE_LOW; pdata->relative_axis = of_property_read_bool(np, "rotary-encoder,relative-axis"); pdata->rollover = of_property_read_bool(np, "rotary-encoder,rollover"); - error = of_property_read_u32(np, "rotary-encoder,steps-per-period", - &pdata->steps_per_period); - if (error) { + ret = of_property_read_u32(np, "rotary-encoder,steps-per-period", + &pdata->steps_per_period); + if (ret) { /* * The 'half-period' property has been deprecated, you must use * 'steps-per-period' and set an appropriate value, but we still
--
2.7.0
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html