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

Commit b55a7a5f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu_gpio_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux into fixes 

From Jason Cooper:
 - missing break;s from converting if{}s to switch{}

* tag 'mvebu_gpio_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux:
  gpio: mvebu: Add missing breaks in mvebu_gpio_irq_set_type
parents 327f81c4 7cf8c9f7

drivers/gpio/gpio-mvebu.c

+3 −0
Original line number Diff line number Diff line
@@ -381,11 +381,13 @@ static int mvebu_gpio_irq_set_type(struct irq_data *d, unsigned int type) 
		u = readl_relaxed(mvebu_gpioreg_in_pol(mvchip));

		u &= ~(1 << pin);

		writel_relaxed(u, mvebu_gpioreg_in_pol(mvchip));

		break;

	case IRQ_TYPE_EDGE_FALLING:

	case IRQ_TYPE_LEVEL_LOW:

		u = readl_relaxed(mvebu_gpioreg_in_pol(mvchip));

		u |= 1 << pin;

		writel_relaxed(u, mvebu_gpioreg_in_pol(mvchip));

		break;

	case IRQ_TYPE_EDGE_BOTH: {

		u32 v;
@@ -401,6 +403,7 @@ static int mvebu_gpio_irq_set_type(struct irq_data *d, unsigned int type) 
		else

			u &= ~(1 << pin);	/* rising */

		writel_relaxed(u, mvebu_gpioreg_in_pol(mvchip));

		break;

	}

	}

	return 0;