Commit c9d66d35 authored Aug 16, 2010 by Mark Brown Committed by Samuel Ortiz Sep 29, 2010

mfd: Ignore non-GPIO IRQs when setting wm831x IRQ types



The driver was originally tested with an additional patch which
made this unneeded but that patch had issuges and got lost on the
way to mainline, causing problems when the errors are reported.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Cc: stable@kernel.org

parent 899611ee

drivers/mfd/wm831x-irq.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -394,8 +394,13 @@ static int wm831x_irq_set_type(unsigned int irq, unsigned int type)

		irq = irq - wm831x->irq_base;

		if (irq < WM831X_IRQ_GPIO_1 \|\| irq > WM831X_IRQ_GPIO_11)
		if (irq < WM831X_IRQ_GPIO_1 \|\| irq > WM831X_IRQ_GPIO_11) {
		/* Ignore internal-only IRQs */
		if (irq >= 0 && irq < WM831X_NUM_IRQS)
		return 0;
		else
		return -EINVAL;
		}

		switch (type) {
		case IRQ_TYPE_EDGE_BOTH:

Admin message