leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branches 'thermal-core' and 'thermal-intel' into next

Browse Source
This commit is contained in:
Zhang Rui 2017-05-05 20:30:03 +08:00
commit a6128f47f7
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/thermal/intel_soc_dts_thermal.c
View File

@ -73,8 +73,12 @@ static int __init intel_soc_thermal_init(void)
IRQF_TRIGGER_RISING | IRQF_ONESHOT, IRQF_TRIGGER_RISING | IRQF_ONESHOT,
"soc_dts", soc_dts); "soc_dts", soc_dts);
if (err) { 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: error_trips:
if (soc_dts_thres_irq) if (soc_dts_thres_irq)
free_irq(soc_dts_thres_irq, soc_dts); free_irq(soc_dts_thres_irq, soc_dts);
error_irq:
intel_soc_dts_iosf_exit(soc_dts); intel_soc_dts_iosf_exit(soc_dts);
return err; return err;