Merge "thermal: tsens: Fix TSENS Upper/Lower IRQ type"

lettuce-oreo · Jan 15, 2015 · 2889093 · 2889093
2 parents 54cff1d + ae54f09
commit 2889093
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/drivers/thermal/msm8974-tsens.c b/drivers/thermal/msm8974-tsens.c
@@ -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++)