diff options
| author |   Zhang Rui <rui.zhang@intel.com> | 2017-05-05 20:30:03 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2017-05-05 20:30:03 +0800 |
| commit | a6128f47f7940d8388ca7c8623fbe24e52f8fae6 (patch) | |
| tree | ddbd6f0c666202dca51eadd4cb2b18ab32e5f3d0 /drivers/thermal | |
| parent | trace: thermal: add another parameter 'power' to the tracing function (diff) | |
| parent | Thermal: Intel SoC DTS: Change interrupt request behavior (diff) | |
| download | linux-dev-a6128f47f7940d8388ca7c8623fbe24e52f8fae6.tar.xz linux-dev-a6128f47f7940d8388ca7c8623fbe24e52f8fae6.zip | |
Merge branches 'thermal-core' and 'thermal-intel' into next
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/intel_soc_dts_thermal.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/thermal/intel_soc_dts_thermal.c b/drivers/thermal/intel_soc_dts_thermal.c index b2bbaa1c60b0..c27868b2c6af 100644 --- a/drivers/thermal/intel_soc_dts_thermal.c +++ b/drivers/thermal/intel_soc_dts_thermal.c @@ -73,8 +73,12 @@ static int __init intel_soc_thermal_init(void) IRQF_TRIGGER_RISING | IRQF_ONESHOT, "soc_dts", soc_dts); if (err) { - pr_err("request_threaded_irq ret %d\n", err); - goto error_irq; + /* + * Do not just error out because the user space thermal + * daemon such as DPTF may use polling instead of being + * interrupt driven. + */ + pr_warn("request_threaded_irq ret %d\n", err); } } @@ -88,7 +92,6 @@ static int __init intel_soc_thermal_init(void) error_trips: if (soc_dts_thres_irq) free_irq(soc_dts_thres_irq, soc_dts); -error_irq: intel_soc_dts_iosf_exit(soc_dts); return err; |