4.9-stable patches

added patches:
	hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch
	platform-x86-sony-laptop-fix-unintentional-fall-through.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
new file mode 100644 (file)
index 0000000..662f5e0
--- /dev/null
+++ b/queue-4.9/hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch
@@ -0,0 +1,34 @@
+From 53f1647da3e8fb3e89066798f0fdc045064d353d Mon Sep 17 00:00:00 2001
+From: Stefan Wahren <stefan.wahren@i2se.com>
+Date: Wed, 3 Apr 2019 14:48:33 +0200
+Subject: hwmon: (pwm-fan) Disable PWM if fetching cooling data fails
+
+From: Stefan Wahren <stefan.wahren@i2se.com>
+
+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: <stable@vger.kernel.org> # 4.14+
+Reported-by: Guenter Rock <linux@roeck-us.net>
+Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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/platform-x86-sony-laptop-fix-unintentional-fall-through.patch b/queue-4.9/platform-x86-sony-laptop-fix-unintentional-fall-through.patch
new file mode 100644 (file)
index 0000000..e7870c1
--- /dev/null
+++ b/queue-4.9/platform-x86-sony-laptop-fix-unintentional-fall-through.patch
@@ -0,0 +1,53 @@
+From 1cbd7a64959d33e7a2a1fa2bf36a62b350a9fcbd Mon Sep 17 00:00:00 2001
+From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
+Date: Wed, 24 Apr 2019 13:09:34 -0500
+Subject: platform/x86: sony-laptop: Fix unintentional fall-through
+
+From: Gustavo A. R. Silva <gustavo@embeddedor.com>
+
+commit 1cbd7a64959d33e7a2a1fa2bf36a62b350a9fcbd upstream.
+
+It seems that the default case should return AE_CTRL_TERMINATE, instead
+of falling through to case ACPI_RESOURCE_TYPE_END_TAG and returning AE_OK;
+otherwise the line of code at the end of the function is unreachable and
+makes no sense:
+
+return AE_CTRL_TERMINATE;
+
+This fix is based on the following thread of discussion:
+
+https://lore.kernel.org/patchwork/patch/959782/
+
+Fixes: 33a04454527e ("sony-laptop: Add SNY6001 device handling (sonypi reimplementation)")
+Cc: stable@vger.kernel.org
+Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
+Reviewed-by: Kees Cook <keescook@chromium.org>
+Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/platform/x86/sony-laptop.c |    8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+--- a/drivers/platform/x86/sony-laptop.c
++++ b/drivers/platform/x86/sony-laptop.c
+@@ -4422,14 +4422,16 @@ sony_pic_read_possible_resource(struct a
+                       }
+                       return AE_OK;
+               }
++
++      case ACPI_RESOURCE_TYPE_END_TAG:
++              return AE_OK;
++
+       default:
+               dprintk("Resource %d isn't an IRQ nor an IO port\n",
+                       resource->type);
++              return AE_CTRL_TERMINATE;
+ 
+-      case ACPI_RESOURCE_TYPE_END_TAG:
+-              return AE_OK;
+       }
+-      return AE_CTRL_TERMINATE;
+ }
+ 
+ static int sony_pic_possible_resources(struct acpi_device *device)

diff --git a/queue-4.9/series b/queue-4.9/series
index 8acecc1c4d996c25bf09baa9c7e48d92f705c5e0..d233f8fd82745fbe9d5bb7787d0a788659704806 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -1,3 +1,5 @@
 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