Merge tag 'gpio-v3.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio (386aa051) · Commits · 戴 / test

drivers/gpio/gpio-lynxpoint.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -248,14 +248,15 @@ static void lp_gpio_irq_handler(unsigned irq, struct irq_desc *desc)
		struct lp_gpio *lg = irq_data_get_irq_handler_data(data);
		struct irq_chip *chip = irq_data_get_irq_chip(data);
		u32 base, pin, mask;
		unsigned long reg, pending;
		unsigned long reg, ena, pending;
		unsigned virq;

		/* check from GPIO controller which pin triggered the interrupt */
		for (base = 0; base < lg->chip.ngpio; base += 32) {
		reg = lp_gpio_reg(&lg->chip, base, LP_INT_STAT);
		ena = lp_gpio_reg(&lg->chip, base, LP_INT_ENABLE);

		while ((pending = inl(reg))) {
		while ((pending = (inl(reg) & inl(ena)))) {
		pin = __ffs(pending);
		mask = BIT(pin);
		/* Clear before handling so we don't lose an edge */

+4 −2

Original line number	Diff line number	Diff line
		@@ -136,7 +136,7 @@ static struct gpio_desc *gpio_to_desc(unsigned gpio)
		*/
		static int desc_to_gpio(const struct gpio_desc *desc)
		{
		return desc->chip->base + gpio_chip_hwgpio(desc);
		return desc - &gpio_desc[0];
		}


		@@ -1398,7 +1398,7 @@ static int gpiod_request(struct gpio_desc desc, const char label)
		int status = -EPROBE_DEFER;
		unsigned long flags;

		if (!desc \|\| !desc->chip) {
		if (!desc) {
		pr_warn("%s: invalid GPIO\n", __func__);
		return -EINVAL;
		}
		@@ -1406,6 +1406,8 @@ static int gpiod_request(struct gpio_desc desc, const char label)
		spin_lock_irqsave(&gpio_lock, flags);

		chip = desc->chip;
		if (chip == NULL)
		goto done;

		if (!try_module_get(chip->owner))
		goto done;