summaryrefslogtreecommitdiffstats
path: root/qcom-msm89xx-fixes.patch
diff options
context:
space:
mode:
authorJeremy Cline <jcline@redhat.com>2018-08-17 09:27:40 +0100
committerJeremy Cline <jcline@redhat.com>2018-08-17 09:27:40 +0100
commit186cf004cba1758f86604d266ee0e34526be17ca (patch)
tree941dc4d17653627221032c3e3baa5780656f0ba1 /qcom-msm89xx-fixes.patch
parente9bc1eed737b6cc6f28b30ccb0a2436dd9053636 (diff)
downloadkernel-186cf004cba1758f86604d266ee0e34526be17ca.tar.gz
kernel-186cf004cba1758f86604d266ee0e34526be17ca.tar.xz
kernel-186cf004cba1758f86604d266ee0e34526be17ca.zip
Linux v4.18-8108-g5c60a7389d79
Diffstat (limited to 'qcom-msm89xx-fixes.patch')
-rw-r--r--qcom-msm89xx-fixes.patch13
1 files changed, 7 insertions, 6 deletions
diff --git a/qcom-msm89xx-fixes.patch b/qcom-msm89xx-fixes.patch
index f7ac2815c..0ef0ad328 100644
--- a/qcom-msm89xx-fixes.patch
+++ b/qcom-msm89xx-fixes.patch
@@ -1,7 +1,7 @@
-From 40cb129048e5d2456da8d9d6468f292da3071b91 Mon Sep 17 00:00:00 2001
+From cadf6ce5a3929b42b0e63fe36d0c08bf6b59f25e Mon Sep 17 00:00:00 2001
From: Rob Clark <robdclark@gmail.com>
Date: Fri, 30 Jun 2017 16:40:23 -0400
-Subject: [PATCH 4/6] thermal: qcom: tsens: fix crash due to incorrect __init
+Subject: [PATCH] thermal: qcom: tsens: fix crash due to incorrect __init
init_common() is called from probe, which can happen after the __init
section is already unloaded in the case of -EPROBE_DEFER. Causing a
@@ -15,10 +15,10 @@ Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c
-index b1449ad67fc0..22ad37c9808c 100644
+index 6207d8d92351..920167c6eac5 100644
--- a/drivers/thermal/qcom/tsens-common.c
+++ b/drivers/thermal/qcom/tsens-common.c
-@@ -123,7 +123,7 @@ static const struct regmap_config tsens_config = {
+@@ -124,7 +124,7 @@ static const struct regmap_config tsens_config = {
.reg_stride = 4,
};
@@ -26,6 +26,7 @@ index b1449ad67fc0..22ad37c9808c 100644
+int init_common(struct tsens_device *tmdev)
{
void __iomem *base;
-
+ struct resource *res;
--
-2.13.0
+2.17.1
+