Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd0888c2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

drivers/mfd/ezx-pcap.c

+3 −1
Original line number Diff line number Diff line
@@ -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);

drivers/mfd/sm501.c

+2 −1
Original line number Diff line number Diff line
@@ -367,7 +367,8 @@ int sm501_unit_power(struct device *dev, unsigned int unit, unsigned int to) 
		break;



	default:

		return -1;

		gate = -1;

		goto already;

	}



	writel(mode, sm->regs + SM501_POWER_MODE_CONTROL);