Commit dd0888c2 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: fix pcap adc locking
  mfd: sm501, fix lock imbalance
parents 14c1b7c2 1c90ea2c
...@@ -238,8 +238,10 @@ static irqreturn_t pcap_adc_irq(int irq, void *_pcap) ...@@ -238,8 +238,10 @@ static irqreturn_t pcap_adc_irq(int irq, void *_pcap)
mutex_lock(&pcap->adc_mutex); mutex_lock(&pcap->adc_mutex);
req = pcap->adc_queue[pcap->adc_head]; 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; return IRQ_HANDLED;
}
/* read requested channels results */ /* read requested channels results */
ezx_pcap_read(pcap, PCAP_REG_ADC, &tmp); ezx_pcap_read(pcap, PCAP_REG_ADC, &tmp);
......
...@@ -367,7 +367,8 @@ int sm501_unit_power(struct device *dev, unsigned int unit, unsigned int to) ...@@ -367,7 +367,8 @@ int sm501_unit_power(struct device *dev, unsigned int unit, unsigned int to)
break; break;
default: default:
return -1; gate = -1;
goto already;
} }
writel(mode, sm->regs + SM501_POWER_MODE_CONTROL); writel(mode, sm->regs + SM501_POWER_MODE_CONTROL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment