diff options
| author |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2023-05-27 08:32:07 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2023-05-27 08:32:07 +0100 |
| commit | 0e4daea31d8312dd9f957a62717d4b5f31ef494c (patch) | |
| tree | a9edacaf51413354d0df35f6faf7f002a6f34bf0 /drivers/nvme/host/hwmon.c | |
| parent | serial: Make uart_remove_one_port() return void (diff) | |
| parent | Linux 6.4-rc3 (diff) | |
| download | linux-0e4daea31d8312dd9f957a62717d4b5f31ef494c.tar.gz linux-0e4daea31d8312dd9f957a62717d4b5f31ef494c.tar.bz2 linux-0e4daea31d8312dd9f957a62717d4b5f31ef494c.zip | |
Merge 6.4-rc3 into tty-next
We need the serial/tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/nvme/host/hwmon.c')
| -rw-r--r-- | drivers/nvme/host/hwmon.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/nvme/host/hwmon.c b/drivers/nvme/host/hwmon.c index 9e6e56c20ec9..316f3e4ca7cc 100644 --- a/drivers/nvme/host/hwmon.c +++ b/drivers/nvme/host/hwmon.c @@ -163,7 +163,9 @@ static umode_t nvme_hwmon_is_visible(const void *_data, case hwmon_temp_max: case hwmon_temp_min: if ((!channel && data->ctrl->wctemp) || - (channel && data->log->temp_sensor[channel - 1])) { + (channel && data->log->temp_sensor[channel - 1] && + !(data->ctrl->quirks & + NVME_QUIRK_NO_SECONDARY_TEMP_THRESH))) { if (data->ctrl->quirks & NVME_QUIRK_NO_TEMP_THRESH_CHANGE) return 0444; |