Merge branches 'thermal-core' and 'thermal-intel' into next (a6128f47) · Commits · e / devices / android_kernel_teracube_emerald

drivers/thermal/intel_soc_dts_thermal.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -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;