Commit 65c6b7e3 authored Apr 14, 2015 by Sebastian Hesselbarth Committed by Bryan Wu May 04, 2015

leds: gpio: Fix device teardown on probe deferral



In gpio_leds_create(), when devm_get_gpiod_from_child() fails with
-EPROBE_DEFER on the second gpio led to be created, the first already
registered led is not torn down properly. This causes create_gpio_led()
to fail for the first led on re-probe().

Fix this misbehaviour by incrementing num_leds only if all
potentially failing calls completed successfully.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Signed-off-by: Bryan Wu <cooloney@gmail.com>

parent e370d010

drivers/leds/leds-gpio.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -217,18 +217,19 @@ static struct gpio_leds_priv gpio_leds_create(struct platform_device pdev)
		if (fwnode_property_present(child, "retain-state-suspended"))
		led.retain_state_suspended = 1;

		ret = create_gpio_led(&led, &priv->leds[priv->num_leds++],
		ret = create_gpio_led(&led, &priv->leds[priv->num_leds],
		dev, NULL);
		if (ret < 0) {
		fwnode_handle_put(child);
		goto err;
		}
		priv->num_leds++;
		}

		return priv;

		err:
		for (count = priv->num_leds - 2; count >= 0; count--)
		for (count = priv->num_leds - 1; count >= 0; count--)
		delete_gpio_led(&priv->leds[count]);
		return ERR_PTR(ret);
		}

Admin message