summaryrefslogtreecommitdiffstats
path: root/drivers/thermal/qcom/tsens.c
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2021-10-04 17:37:22 +0200
committerBorislav Petkov <bp@suse.de>2021-10-04 17:37:22 +0200
commitc7419a6e1aa3219ff62045ab6e56e37d5ad2d292 (patch)
treea5145db864629e50196ba0f13e0b1c80f7d4331a /drivers/thermal/qcom/tsens.c
parentx86: Increase exception stack sizes (diff)
parenttreewide: Replace the use of mem_encrypt_active() with cc_platform_has() (diff)
downloadlinux-c7419a6e1aa3219ff62045ab6e56e37d5ad2d292.tar.xz
linux-c7419a6e1aa3219ff62045ab6e56e37d5ad2d292.zip
Merge branch x86/cc into x86/core
Pick up dependent cc_platform_has() changes. Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'drivers/thermal/qcom/tsens.c')
-rw-r--r--drivers/thermal/qcom/tsens.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index 4c7ebd1d3f9c..b1162e566a70 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -417,7 +417,7 @@ static irqreturn_t tsens_critical_irq_thread(int irq, void *data)
const struct tsens_sensor *s = &priv->sensor[i];
u32 hw_id = s->hw_id;
- if (IS_ERR(s->tzd))
+ if (!s->tzd)
continue;
if (!tsens_threshold_violated(priv, hw_id, &d))
continue;
@@ -467,7 +467,7 @@ static irqreturn_t tsens_irq_thread(int irq, void *data)
const struct tsens_sensor *s = &priv->sensor[i];
u32 hw_id = s->hw_id;
- if (IS_ERR(s->tzd))
+ if (!s->tzd)
continue;
if (!tsens_threshold_violated(priv, hw_id, &d))
continue;