From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Matthew Garrett <matthewgarrett@google.com>,
Matthew Garrett <mjg59@google.com>,
Zhang Rui <rui.zhang@intel.com>, Sasha Levin <sashal@kernel.org>,
linux-pm@vger.kernel.org
Subject: [PATCH AUTOSEL 3.18 08/15] thermal/int340x_thermal: fix mode setting
Date: Fri, 29 Mar 2019 20:57:23 -0400 [thread overview]
Message-ID: <20190330005730.28777-8-sashal@kernel.org> (raw)
In-Reply-To: <20190330005730.28777-1-sashal@kernel.org>
From: Matthew Garrett <matthewgarrett@google.com>
[ Upstream commit 396ee4d0cd52c13b3f6421b8d324d65da5e7e409 ]
int3400 only pushes the UUID into the firmware when the mode is flipped
to "enable". The current code only exposes the mode flag if the firmware
supports the PASSIVE_1 UUID, which not all machines do. Remove the
restriction.
Signed-off-by: Matthew Garrett <mjg59@google.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/thermal/int340x_thermal/int3400_thermal.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
index edc1cce117ba..7b96b20e939a 100644
--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
@@ -208,10 +208,9 @@ static int int3400_thermal_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, priv);
- if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
- int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
- int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
- }
+ int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
+ int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
+
priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
priv, &int3400_thermal_ops,
&int3400_thermal_params, 0, 0);
--
2.19.1
next prev parent reply other threads:[~2019-03-30 0:58 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-30 0:57 [PATCH AUTOSEL 3.18 01/15] perf/core: Restore mmap record type correctly Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 02/15] ext4: report real fs size after failed resize Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 03/15] ALSA: echoaudio: add a check for ioremap_nocache Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 04/15] ALSA: sb8: add a check for request_region Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 05/15] IB/mlx4: Fix race condition between catas error reset and aliasguid flows Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 06/15] mmc: davinci: remove extraneous __init annotation Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 07/15] ALSA: opl3: fix mismatch between snd_opl3_drum_switch definition and declaration Sasha Levin
2019-03-30 0:57 ` Sasha Levin [this message]
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 09/15] tools/power turbostat: return the exit status of a command Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 10/15] perf top: Fix error handling in cmd_top() Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 11/15] perf tests: Fix a memory leak in test__perf_evsel__tp_sched_test() Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 12/15] x86/hpet: Prevent potential NULL pointer dereference Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 13/15] x86/cpu/cyrix: Use correct macros for Cyrix calls on Geode processors Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 14/15] iommu/vt-d: Check capability before disabling protected memory Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 15/15] fix incorrect error code mapping for OBJECTID_NOT_FOUND Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190330005730.28777-8-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=matthewgarrett@google.com \
--cc=mjg59@google.com \
--cc=rui.zhang@intel.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).