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

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

Merge tag 'gpio-v4.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull GPIO fixes from Linus Walleij:
 "Here are the (hopefully) last GPIO fixes for v4.13:

   - an important core fix to reject invalid GPIOs *before* trying to
     obtain a GPIO descriptor for it.

   - a driver fix for the mvebu driver IRQ handling"

* tag 'gpio-v4.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: mvebu: Fix cause computation in irq handler
  gpio: reject invalid gpio before getting gpio_desc
parents 55652400 3f13b6a2

drivers/gpio/gpio-mvebu.c

+1 −1
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ static void mvebu_gpio_irq_handler(struct irq_desc *desc) 
	edge_cause = mvebu_gpio_read_edge_cause(mvchip);

	edge_mask  = mvebu_gpio_read_edge_mask(mvchip);



	cause = (data_in ^ level_mask) | (edge_cause & edge_mask);

	cause = (data_in & level_mask) | (edge_cause & edge_mask);



	for (i = 0; i < mvchip->chip.ngpio; i++) {

		int irq;

drivers/gpio/gpiolib-sysfs.c

+8 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <linux/mutex.h>

#include <linux/device.h>

#include <linux/sysfs.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/gpio/driver.h>

#include <linux/interrupt.h>
@@ -432,6 +433,11 @@ static struct attribute *gpiochip_attrs[] = { 
};

ATTRIBUTE_GROUPS(gpiochip);



static struct gpio_desc *gpio_to_valid_desc(int gpio)

{

	return gpio_is_valid(gpio) ? gpio_to_desc(gpio) : NULL;

}



/*

 * /sys/class/gpio/export ... write-only

 *	integer N ... number of GPIO to export (full access)
@@ -450,7 +456,7 @@ static ssize_t export_store(struct class *class, 
	if (status < 0)

		goto done;



	desc = gpio_to_desc(gpio);

	desc = gpio_to_valid_desc(gpio);

	/* reject invalid GPIOs */

	if (!desc) {

		pr_warn("%s: invalid GPIO %ld\n", __func__, gpio);
@@ -493,7 +499,7 @@ static ssize_t unexport_store(struct class *class, 
	if (status < 0)

		goto done;



	desc = gpio_to_desc(gpio);

	desc = gpio_to_valid_desc(gpio);

	/* reject bogus commands (gpio_unexport ignores them) */

	if (!desc) {

		pr_warn("%s: invalid GPIO %ld\n", __func__, gpio);