Commit 64ed6588 authored Apr 01, 2020 by Ricardo Ribalda Delgado Committed by Pavel Machek Apr 06, 2020

leds: core: Fix warning message when init_data



The warning message when a led is renamed due to name collition can fail
to show proper original name if init_data is used. Eg:

[    9.073996] leds-gpio a0040000.leds_0: Led (null) renamed to red_led_1 due to name collision

Fixes: bb4e9af0 ("leds: core: Add support for composing LED class device names")
Signed-off-by: Ricardo Ribalda Delgado <ribalda@kernel.org>
Acked-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Signed-off-by: Pavel Machek <pavel@ucw.cz>

parent 4b37883a

drivers/leds/led-class.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -376,7 +376,7 @@ int led_classdev_register_ext(struct device *parent,

		if (ret)
		dev_warn(parent, "Led %s renamed to %s due to name collision",
		led_cdev->name, dev_name(led_cdev->dev));
		proposed_name, dev_name(led_cdev->dev));

		if (led_cdev->flags & LED_BRIGHT_HW_CHANGED) {
		ret = led_add_brightness_hw_changed(led_cdev);

Admin message