diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-09 21:08:25 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-09 21:08:25 +0200 |
commit | 959cd3ad26748801b73a3025b9c2835dc70e644c (patch) | |
tree | f0207748ce26b75a2e277846574a98924acf7eac /qcom-msm89xx-fixes.patch | |
parent | bb30288ad29d581b4c12c1daf39cd1b265bf254d (diff) | |
parent | 5c2ab4e801af208f640dc06a07e6a55cca2c1d74 (diff) | |
download | kernel-959cd3ad26748801b73a3025b9c2835dc70e644c.tar.gz kernel-959cd3ad26748801b73a3025b9c2835dc70e644c.tar.xz kernel-959cd3ad26748801b73a3025b9c2835dc70e644c.zip |
merge origin, 5.2.0
Diffstat (limited to 'qcom-msm89xx-fixes.patch')
-rw-r--r-- | qcom-msm89xx-fixes.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/qcom-msm89xx-fixes.patch b/qcom-msm89xx-fixes.patch deleted file mode 100644 index 4bc06ebd2..000000000 --- a/qcom-msm89xx-fixes.patch +++ /dev/null @@ -1,32 +0,0 @@ -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] 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 -later probe to attempt to branch to hyperspace. - -Cc: <stable@vger.kernel.org> -Signed-off-by: Rob Clark <robdclark@gmail.com> -Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org> ---- - drivers/thermal/qcom/tsens-common.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c -index 6207d8d92351..920167c6eac5 100644 ---- a/drivers/thermal/qcom/tsens-common.c -+++ b/drivers/thermal/qcom/tsens-common.c -@@ -124,7 +124,7 @@ static const struct regmap_config tsens_config = { - .reg_stride = 4, - }; - --int __init init_common(struct tsens_device *tmdev) -+int init_common(struct tsens_device *tmdev) - { - void __iomem *tm_base, *srot_base; - struct resource *res; --- -2.17.1 - |