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

+6 -3
+6 -3
drivers/thermal/intel_soc_dts_thermal.c
··· 73 IRQF_TRIGGER_RISING | IRQF_ONESHOT, 74 "soc_dts", soc_dts); 75 if (err) { 76 - pr_err("request_threaded_irq ret %d\n", err); 77 - goto error_irq; 78 } 79 } 80 ··· 92 error_trips: 93 if (soc_dts_thres_irq) 94 free_irq(soc_dts_thres_irq, soc_dts); 95 - error_irq: 96 intel_soc_dts_iosf_exit(soc_dts); 97 98 return err;
··· 73 IRQF_TRIGGER_RISING | IRQF_ONESHOT, 74 "soc_dts", soc_dts); 75 if (err) { 76 + /* 77 + * Do not just error out because the user space thermal 78 + * daemon such as DPTF may use polling instead of being 79 + * interrupt driven. 80 + */ 81 + pr_warn("request_threaded_irq ret %d\n", err); 82 } 83 } 84 ··· 88 error_trips: 89 if (soc_dts_thres_irq) 90 free_irq(soc_dts_thres_irq, soc_dts); 91 intel_soc_dts_iosf_exit(soc_dts); 92 93 return err;