tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds dd0888c2 14c1b7c2

+5 -2
+3 -1
drivers/mfd/ezx-pcap.c
··· 238 238 mutex_lock(&pcap->adc_mutex); 239 239 req = pcap->adc_queue[pcap->adc_head]; 240 240 241 - if (WARN(!req, KERN_WARNING "adc irq without pending request\n")) 241 + if (WARN(!req, KERN_WARNING "adc irq without pending request\n")) { 242 + mutex_unlock(&pcap->adc_mutex); 242 243 return IRQ_HANDLED; 244 + } 243 245 244 246 /* read requested channels results */ 245 247 ezx_pcap_read(pcap, PCAP_REG_ADC, &tmp);
+2 -1
drivers/mfd/sm501.c
··· 367 367 break; 368 368 369 369 default: 370 - return -1; 370 + gate = -1; 371 + goto already; 371 372 } 372 373 373 374 writel(mode, sm->regs + SM501_POWER_MODE_CONTROL);