Unverified Commit 1723fdec authored Apr 03, 2019 by Geert Uytterhoeven Committed by Mark Brown Apr 04, 2019

spi: Add missing error handling for CS GPIOs



While devm_gpiod_get_index_optional() returns NULL if the GPIO is not
present (i.e. -ENOENT), it may still return other error codes, like
-EPROBE_DEFER.  Currently these are not handled, leading to
unrecoverable failures later in case of probe deferral:

    gpiod_set_consumer_name: invalid GPIO (errorpointer)
    gpiod_direction_output: invalid GPIO (errorpointer)
    gpiod_set_value_cansleep: invalid GPIO (errorpointer)
    gpiod_set_value_cansleep: invalid GPIO (errorpointer)
    gpiod_set_value_cansleep: invalid GPIO (errorpointer)

Detect and propagate errors to fix this.

Fixes: f3186dd8 ("spi: Optionally use GPIO descriptors for CS GPIOs")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 807195f2

drivers/spi/spi.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2197,6 +2197,8 @@ static int spi_get_gpio_descs(struct spi_controller *ctlr)
	*/		*/
	cs[i] = devm_gpiod_get_index_optional(dev, "cs", i,		cs[i] = devm_gpiod_get_index_optional(dev, "cs", i,
	GPIOD_OUT_LOW);		GPIOD_OUT_LOW);
			if (IS_ERR(cs[i]))
			return PTR_ERR(cs[i]);

	if (cs[i]) {		if (cs[i]) {
	/*		/*

Admin message