From 5caae014206b79e66e51bc97007ca801cb804c37 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 13 May 2019 10:12:32 +0200 Subject: [PATCH] drop hwmon patch from 4.9 and 4.4 --- ...e-pwm-if-fetching-cooling-data-fails.patch | 34 ------------------- queue-4.4/series | 1 - ...e-pwm-if-fetching-cooling-data-fails.patch | 34 ------------------- queue-4.9/series | 1 - 4 files changed, 70 deletions(-) delete mode 100644 queue-4.4/hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch delete mode 100644 queue-4.9/hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch diff --git a/queue-4.4/hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch b/queue-4.4/hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch deleted file mode 100644 index 24dc2827bb..0000000000 --- a/queue-4.4/hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 53f1647da3e8fb3e89066798f0fdc045064d353d Mon Sep 17 00:00:00 2001 -From: Stefan Wahren -Date: Wed, 3 Apr 2019 14:48:33 +0200 -Subject: hwmon: (pwm-fan) Disable PWM if fetching cooling data fails - -From: Stefan Wahren - -commit 53f1647da3e8fb3e89066798f0fdc045064d353d upstream. - -In case pwm_fan_of_get_cooling_data() fails we should disable the PWM -just like in the other error cases. - -Fixes: 2e5219c77183 ("hwmon: (pwm-fan) Read PWM FAN configuration from device tree") -Cc: # 4.14+ -Reported-by: Guenter Rock -Signed-off-by: Stefan Wahren -Signed-off-by: Guenter Roeck -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/hwmon/pwm-fan.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/hwmon/pwm-fan.c -+++ b/drivers/hwmon/pwm-fan.c -@@ -260,7 +260,7 @@ static int pwm_fan_probe(struct platform - - ret = pwm_fan_of_get_cooling_data(&pdev->dev, ctx); - if (ret) -- return ret; -+ goto err_pwm_disable; - - ctx->pwm_fan_state = ctx->pwm_fan_max_state; - if (IS_ENABLED(CONFIG_THERMAL)) { diff --git a/queue-4.4/series b/queue-4.4/series index da3aff7999..56765c9535 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -159,4 +159,3 @@ timer-debug-change-proc-timer_stats-from-0644-to-0600.patch netfilter-compat-initialize-all-fields-in-xt_init.patch mm-vmstat-make-quiet_vmstat-lighter.patch platform-x86-sony-laptop-fix-unintentional-fall-through.patch -hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch diff --git a/queue-4.9/hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch b/queue-4.9/hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch deleted file mode 100644 index 662f5e0cb9..0000000000 --- a/queue-4.9/hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 53f1647da3e8fb3e89066798f0fdc045064d353d Mon Sep 17 00:00:00 2001 -From: Stefan Wahren -Date: Wed, 3 Apr 2019 14:48:33 +0200 -Subject: hwmon: (pwm-fan) Disable PWM if fetching cooling data fails - -From: Stefan Wahren - -commit 53f1647da3e8fb3e89066798f0fdc045064d353d upstream. - -In case pwm_fan_of_get_cooling_data() fails we should disable the PWM -just like in the other error cases. - -Fixes: 2e5219c77183 ("hwmon: (pwm-fan) Read PWM FAN configuration from device tree") -Cc: # 4.14+ -Reported-by: Guenter Rock -Signed-off-by: Stefan Wahren -Signed-off-by: Guenter Roeck -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/hwmon/pwm-fan.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/hwmon/pwm-fan.c -+++ b/drivers/hwmon/pwm-fan.c -@@ -272,7 +272,7 @@ static int pwm_fan_probe(struct platform - - ret = pwm_fan_of_get_cooling_data(&pdev->dev, ctx); - if (ret) -- return ret; -+ goto err_pwm_disable; - - ctx->pwm_fan_state = ctx->pwm_fan_max_state; - if (IS_ENABLED(CONFIG_THERMAL)) { diff --git a/queue-4.9/series b/queue-4.9/series index d233f8fd82..d50e07ac4b 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -2,4 +2,3 @@ netfilter-compat-initialize-all-fields-in-xt_init.patch bpf-fix-struct-htab_elem-layout.patch bpf-convert-htab-map-to-hlist_nulls.patch platform-x86-sony-laptop-fix-unintentional-fall-through.patch -hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch -- 2.39.5