From: Greg Kroah-Hartman Date: Tue, 19 Sep 2023 07:58:47 +0000 (+0200) Subject: drop LED patch from 5.10 and 5.15 X-Git-Tag: v5.10.195~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3998de9d0756aa1455e2ddfa029176f1703d22ac;p=thirdparty%2Fkernel%2Fstable-queue.git drop LED patch from 5.10 and 5.15 --- diff --git a/queue-5.10/leds-fix-bug_on-check-for-led_color_id_multi-that-is.patch b/queue-5.10/leds-fix-bug_on-check-for-led_color_id_multi-that-is.patch deleted file mode 100644 index 8cff9de24fa..00000000000 --- a/queue-5.10/leds-fix-bug_on-check-for-led_color_id_multi-that-is.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 1d448bf34bcca7f771dc8a0aac7ad81fd85207f7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 1 Aug 2023 17:16:23 +0200 -Subject: leds: Fix BUG_ON check for LED_COLOR_ID_MULTI that is always false -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Marek Behún - -[ Upstream commit c3f853184bed04105682383c2971798c572226b5 ] - -At the time we call - BUG_ON(props.color == LED_COLOR_ID_MULTI); -the props variable is still initialized to zero. - -Call the BUG_ON only after we parse fwnode into props. - -Fixes: 77dce3a22e89 ("leds: disallow /sys/class/leds/*:multi:* for now") -Signed-off-by: Marek Behún -Link: https://lore.kernel.org/r/20230801151623.30387-1-kabel@kernel.org -Signed-off-by: Lee Jones -Signed-off-by: Sasha Levin ---- - drivers/leds/led-core.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c -index c4e780bdb3852..2cf5897339ac1 100644 ---- a/drivers/leds/led-core.c -+++ b/drivers/leds/led-core.c -@@ -425,15 +425,15 @@ int led_compose_name(struct device *dev, struct led_init_data *init_data, - struct fwnode_handle *fwnode = init_data->fwnode; - const char *devicename = init_data->devicename; - -- /* We want to label LEDs that can produce full range of colors -- * as RGB, not multicolor */ -- BUG_ON(props.color == LED_COLOR_ID_MULTI); -- - if (!led_classdev_name) - return -EINVAL; - - led_parse_fwnode_props(dev, fwnode, &props); - -+ /* We want to label LEDs that can produce full range of colors -+ * as RGB, not multicolor */ -+ BUG_ON(props.color == LED_COLOR_ID_MULTI); -+ - if (props.label) { - /* - * If init_data.devicename is NULL, then it indicates that --- -2.40.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 3ecb3e04ce1..b6b0e136b7d 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -257,7 +257,6 @@ phy-rockchip-inno-hdmi-use-correct-vco_div_5-macro-o.patch phy-rockchip-inno-hdmi-round-fractal-pixclock-in-rk3.patch phy-rockchip-inno-hdmi-do-not-power-on-rk3328-post-p.patch rpmsg-glink-add-check-for-kstrdup.patch -leds-fix-bug_on-check-for-led_color_id_multi-that-is.patch mtd-spi-nor-check-bus-width-while-setting-qe-bit.patch mtd-rawnand-fsmc-handle-clk-prepare-error-in-fsmc_na.patch um-fix-hostaudio-build-errors.patch diff --git a/queue-5.15/leds-fix-bug_on-check-for-led_color_id_multi-that-is.patch b/queue-5.15/leds-fix-bug_on-check-for-led_color_id_multi-that-is.patch deleted file mode 100644 index fc625dffb04..00000000000 --- a/queue-5.15/leds-fix-bug_on-check-for-led_color_id_multi-that-is.patch +++ /dev/null @@ -1,54 +0,0 @@ -From efafe9913f709b5f6625f52e42cbc43f3725f205 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 1 Aug 2023 17:16:23 +0200 -Subject: leds: Fix BUG_ON check for LED_COLOR_ID_MULTI that is always false -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Marek Behún - -[ Upstream commit c3f853184bed04105682383c2971798c572226b5 ] - -At the time we call - BUG_ON(props.color == LED_COLOR_ID_MULTI); -the props variable is still initialized to zero. - -Call the BUG_ON only after we parse fwnode into props. - -Fixes: 77dce3a22e89 ("leds: disallow /sys/class/leds/*:multi:* for now") -Signed-off-by: Marek Behún -Link: https://lore.kernel.org/r/20230801151623.30387-1-kabel@kernel.org -Signed-off-by: Lee Jones -Signed-off-by: Sasha Levin ---- - drivers/leds/led-core.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c -index 4a97cb7457888..aad8bc44459fe 100644 ---- a/drivers/leds/led-core.c -+++ b/drivers/leds/led-core.c -@@ -419,15 +419,15 @@ int led_compose_name(struct device *dev, struct led_init_data *init_data, - struct fwnode_handle *fwnode = init_data->fwnode; - const char *devicename = init_data->devicename; - -- /* We want to label LEDs that can produce full range of colors -- * as RGB, not multicolor */ -- BUG_ON(props.color == LED_COLOR_ID_MULTI); -- - if (!led_classdev_name) - return -EINVAL; - - led_parse_fwnode_props(dev, fwnode, &props); - -+ /* We want to label LEDs that can produce full range of colors -+ * as RGB, not multicolor */ -+ BUG_ON(props.color == LED_COLOR_ID_MULTI); -+ - if (props.label) { - /* - * If init_data.devicename is NULL, then it indicates that --- -2.40.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 34c3a5a547f..8ecbb88f127 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -305,7 +305,6 @@ phy-rockchip-inno-hdmi-do-not-power-on-rk3328-post-p.patch rpmsg-glink-add-check-for-kstrdup.patch leds-pwm-fix-error-code-in-led_pwm_create_fwnode.patch leds-multicolor-use-rounded-division-when-calculatin.patch -leds-fix-bug_on-check-for-led_color_id_multi-that-is.patch leds-trigger-tty-do-not-use-led_on-off-constants-use.patch mtd-spi-nor-check-bus-width-while-setting-qe-bit.patch mtd-rawnand-fsmc-handle-clk-prepare-error-in-fsmc_na.patch