Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: bb4e9af0348d ("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>

authored by

Ricardo Ribalda Delgado and committed by
Pavel Machek
64ed6588 4b37883a

+1 -1
+1 -1
drivers/leds/led-class.c
··· 376 376 377 377 if (ret) 378 378 dev_warn(parent, "Led %s renamed to %s due to name collision", 379 - led_cdev->name, dev_name(led_cdev->dev)); 379 + proposed_name, dev_name(led_cdev->dev)); 380 380 381 381 if (led_cdev->flags & LED_BRIGHT_HW_CHANGED) { 382 382 ret = led_add_brightness_hw_changed(led_cdev);