summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorSumit Gupta <sumitg@nvidia.com>2021-03-24 10:11:56 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2021-05-25 10:24:23 -0400
commit2c40a6bc48f6701fe44cb7edadca26f6a40892da (patch)
treefffbb849a9053acfb87b53d6e260fd45d66a26fc /include/linux
parent6fcc5021a8f8eaef1a2a8e2c342728d1a6ff35d0 (diff)
pwm: fan: fix deadlock due to incorrect locking
Bug 3227296 Bug 200695596 Bug 200728417 Signed-off-by: Sumit Gupta <sumitg@nvidia.com> Change-Id: Ib64915556d285bd798e95da81a261eb2c16b4dab Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2503884 Reviewed-by: svcacv <svcacv@nvidia.com> Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com> Reviewed-by: Bibek Basu <bbasu@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> GVS: Gerrit_Virtual_Submit Tested-by: Bibek Basu <bbasu@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/therm_est.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/therm_est.h b/include/linux/therm_est.h
index 85284a5fe..5c5d916ce 100644
--- a/include/linux/therm_est.h
+++ b/include/linux/therm_est.h
@@ -1,7 +1,7 @@
1/* 1/*
2 * include/linux/therm_est.h 2 * include/linux/therm_est.h
3 * 3 *
4 * Copyright (c) 2010-2020, NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2010-2021, NVIDIA CORPORATION. All rights reserved.
5 * 5 *
6 * This software is licensed under the terms of the GNU General Public 6 * This software is licensed under the terms of the GNU General Public
7 * License version 2, as published by the Free Software Foundation, and 7 * License version 2, as published by the Free Software Foundation, and
@@ -187,7 +187,7 @@ struct fan_dev_data {
187 struct delayed_work fan_ramp_pwm_work; 187 struct delayed_work fan_ramp_pwm_work;
188 struct delayed_work fan_ramp_rpm_work; 188 struct delayed_work fan_ramp_rpm_work;
189 struct device *pwm_tach_dev; 189 struct device *pwm_tach_dev;
190 struct mutex pwm_set; 190 struct completion pwm_set;
191 bool fan_rpm_in_limits; 191 bool fan_rpm_in_limits;
192 int rpm_valid_retry_delay; 192 int rpm_valid_retry_delay;
193 int rpm_invalid_retry_delay; 193 int rpm_invalid_retry_delay;