From 8c8aca240249bf1d05127d56ea98f2265fa75624 Mon Sep 17 00:00:00 2001 From: Daniel Ribeiro Date: Tue, 23 Jun 2009 12:30:58 -0300 Subject: [PATCH] --- yaml --- r: 154871 b: refs/heads/master c: 1c90ea2c7eb3b24a07a2f82164323588fb029bc1 h: refs/heads/master i: 154869: 3974affc912f835c3b0927e86b4de6817ec271cb 154867: ba5d1729ad44f46472c59ceea230c1b0f630caa6 154863: 3c92c07a061a8974ac98bc7ee7a00405fa7e5b36 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/ezx-pcap.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8adf18ace763..0e4a7d7e9acb 100644 --- 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 index 671a7efe86a8..c1de4afa89a6 100644 --- 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);