diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-11-04 15:11:46 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-11-04 15:11:46 +0100 |
commit | 3044f2c4dcd592dddfc96b0b137729790f4e243f (patch) | |
tree | 09f41043da75414f9d3240b8701454ca9c6bf6ac /qcom-msm89xx-fixes.patch | |
parent | ca65cfe0b5e0c76f69c627b21cac9a348572d182 (diff) | |
parent | 35809dfd7be321e9e16516f4314a1699df5bbd39 (diff) | |
download | kernel-3044f2c4dcd592dddfc96b0b137729790f4e243f.tar.gz kernel-3044f2c4dcd592dddfc96b0b137729790f4e243f.tar.xz kernel-3044f2c4dcd592dddfc96b0b137729790f4e243f.zip |
merge origin
Diffstat (limited to 'qcom-msm89xx-fixes.patch')
-rw-r--r-- | qcom-msm89xx-fixes.patch | 13 |
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 + |