Merge "thermal: tsens: Fix TSENS Upper/Lower IRQ type" (28890934) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

drivers/thermal/msm8974-tsens.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -1064,10 +1064,14 @@ static void tsens_scheduler_fn(struct work_struct *work)
		}
		}
		mb();

		enable_irq(tmdev->tsens_irq);
		}

		static irqreturn_t tsens_isr(int irq, void *data)
		{
		disable_irq_nosync(tmdev->tsens_irq);

		queue_work(tmdev->tsens_wq, &tmdev->tsens_work);

		return IRQ_HANDLED;
		@@ -3142,7 +3146,7 @@ static int _tsens_register_thermal(void)
		}

		rc = request_irq(tmdev->tsens_irq, tsens_isr,
		IRQF_TRIGGER_RISING, "tsens_interrupt", tmdev);
		IRQF_TRIGGER_HIGH, "tsens_interrupt", tmdev);
		if (rc < 0) {
		pr_err("%s: request_irq FAIL: %d\n", __func__, rc);
		for (i = 0; i < tmdev->tsens_num_sensor; i++)