---

yaml --- r: 154871 b: refs/heads/master c: 1c90ea2 h: refs/heads/master i: 154869: 3974aff 154867: ba5d172 154863: 3c92c07 v: v3
git-mirror · Jul 3, 2009 · 8c8aca2 · 8c8aca2
1 parent f27b77d
commit 8c8aca2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 992bb253cd6f08129edcb42b90e6c388ebf605f8
+refs/heads/master: 1c90ea2c7eb3b24a07a2f82164323588fb029bc1
diff --git a/trunk/drivers/mfd/ezx-pcap.c b/trunk/drivers/mfd/ezx-pcap.c
@@ -238,8 +238,10 @@ static irqreturn_t pcap_adc_irq(int irq, void *_pcap)
 	mutex_lock(&pcap->adc_mutex);
 	req = pcap->adc_queue[pcap->adc_head];
 
-	if (WARN(!req, KERN_WARNING "adc irq without pending request\n"))
+	if (WARN(!req, KERN_WARNING "adc irq without pending request\n")) {
+		mutex_unlock(&pcap->adc_mutex);
 		return IRQ_HANDLED;
+	}
 
 	/* read requested channels results */
 	ezx_pcap_read(pcap, PCAP_REG_ADC, &tmp);