commit f10a1b86237a55a3bedfebcd5426b62a47a6af4a
author Ben Fennema <fennema@google.com> Thu Sep 22 15:40:20 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 22 15:40:20 2016 +0000
tree b5437dd78f514ce8973e398831c6701a25cd9e65
parent 2ae42c4edb8d14fa5cabf46f041ffef1090e8d0c
parent 351be436af825391c83dc4194ead01c82a6c5347

Merge changes I0fa30f93,I1577e934 into nyc-mr1-dev

* changes:
  synaptics_s3708: don't double enable or disable interrupts
  synaptics_s3708: disable interrupt when powering off

firmware/src/platform/stm32f4xx/exti.c

diff --git a/firmware/src/platform/stm32f4xx/exti.c b/firmware/src/platform/stm32f4xx/exti.c
index 2543ac2..5d5cb4b 100644
--- a/firmware/src/platform/stm32f4xx/exti.c
+++ b/firmware/src/platform/stm32f4xx/exti.c
@@ -186,6 +186,8 @@
     struct ExtiInterrupt *exti = extiForIrq(n);
     if (!exti)
         return -EINVAL;
+    else if (!list_is_empty(&isr->node))
+        return -EINVAL;
 
     chainIsr(&exti->base, isr);
     if (!mMaxLatency || (isr->maxLatencyNs && isr->maxLatencyNs < mMaxLatency))
@@ -199,6 +201,8 @@
     struct ExtiInterrupt *exti = extiForIrq(n);
     if (!exti)
         return -EINVAL;
+    else if (list_is_empty(&isr->node))
+        return -EINVAL;
 
     unchainIsr(&exti->base, isr);
     if (isr->maxLatencyNs && isr->maxLatencyNs == mMaxLatency)