diff options
| author | Greg Kroah-Hartman | 2014-04-28 06:36:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-04-28 06:36:39 +0200 |
| commit | d35cc56ddfc948d8df1aa6d41ac345fcec01854d (patch) | |
| tree | 7e23a0e3dde639236e019aa88309d919941958e5 /drivers/gpio/gpiolib.c | |
| parent | kobject: Make support for uevent_helper optional. (diff) | |
| parent | Linux 3.15-rc3 (diff) | |
| download | kernel-qcow2-linux-d35cc56ddfc948d8df1aa6d41ac345fcec01854d.tar.gz kernel-qcow2-linux-d35cc56ddfc948d8df1aa6d41ac345fcec01854d.tar.xz kernel-qcow2-linux-d35cc56ddfc948d8df1aa6d41ac345fcec01854d.zip | |
Merge 3.15-rc3 into staging-next
Diffstat (limited to 'drivers/gpio/gpiolib.c')
| -rw-r--r-- | drivers/gpio/gpiolib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 761013f8b82f..f48817d97480 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1387,8 +1387,8 @@ static int gpiochip_irq_map(struct irq_domain *d, unsigned int irq, { struct gpio_chip *chip = d->host_data; - irq_set_chip_and_handler(irq, chip->irqchip, chip->irq_handler); irq_set_chip_data(irq, chip); + irq_set_chip_and_handler(irq, chip->irqchip, chip->irq_handler); #ifdef CONFIG_ARM set_irq_flags(irq, IRQF_VALID); #else |