When of_pwm_get() is called without connection ID it returns -ENOENT when the 'pwms' property doesn't exists or is an empty entry. However when a connection ID is given and the 'pwm-names' property doesn't exists or doesn't contains the requested name it returns -ENODATA or -EINVAL.
To get a consistent return value with both code paths we must return -ENOENT when of_property_match_string() fails. Signed-off-by: Alban Bedel <al...@free.fr> --- drivers/pwm/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index d24ca5f..3b4dcb6 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -578,7 +578,7 @@ struct pwm_device *of_pwm_get(struct device_node *np, const char *con_id) if (con_id) { index = of_property_match_string(np, "pwm-names", con_id); if (index < 0) - return ERR_PTR(index); + return ERR_PTR(-ENOENT); } err = of_parse_phandle_with_args(np, "pwms", "#pwm-cells", index, -- 2.0.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/