From: Takashi Iwai Date: Mon, 7 Sep 2015 12:25:01 +0000 (+0200) Subject: leds:lp55xx: Correct Kconfig dependency for f/w user helper X-Git-Tag: v4.2.4~188 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24f0c28de22c6f7c9f3ab37ad1564524f2d6c4c1;p=thirdparty%2Fkernel%2Fstable.git leds:lp55xx: Correct Kconfig dependency for f/w user helper commit 2338f73d407d5abe2036d92716ba25ef5279c3d2 upstream. The commit [b67893206fc0: leds:lp55xx: fix firmware loading error] tries to address the firmware file handling with user helper, but it sets a wrong Kconfig CONFIG_FW_LOADER_USER_HELPER_FALLBACK. Since the wrong option was enabled, the system got a regression -- it suffers from the unexpected long delays for non-present firmware files. This patch corrects the Kconfig dependency to the right one, CONFIG_FW_LOADER_USER_HELPER. This doesn't change the fallback behavior but only enables UMH when needed. Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=944661 Fixes: b67893206fc0 ('leds:lp55xx: fix firmware loading error') Signed-off-by: Takashi Iwai Signed-off-by: Jacek Anaszewski Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 9ad35f72ab4c0..433fb9df848ab 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -229,7 +229,7 @@ config LEDS_LP55XX_COMMON tristate "Common Driver for TI/National LP5521/5523/55231/5562/8501" depends on LEDS_LP5521 || LEDS_LP5523 || LEDS_LP5562 || LEDS_LP8501 select FW_LOADER - select FW_LOADER_USER_HELPER_FALLBACK + select FW_LOADER_USER_HELPER help This option supports common operations for LP5521/5523/55231/5562/8501 devices.