Merge tag 'kvm-ppc-fixes-4.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-bionic-kernel.git] / drivers / thermal / intel_soc_dts_thermal.c

diff --git a/drivers/thermal/intel_soc_dts_thermal.c b/drivers/thermal/intel_soc_dts_thermal.c
index b2bbaa1c60b07e449ddafac601cedca234d936c8..c27868b2c6afc5f438754f370961fee1c3eaac8e 100644 (file)
--- 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;