diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-02-01 09:41:33 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-02-01 09:41:33 +0100 |
| commit | 10a558374f3751cf4eb55143008975641dfc2cf4 (patch) | |
| tree | aab0def9d2289f6520ffb62ec4c1d738135447c4 /drivers/gpio/gpio-lynxpoint.c | |
| parent | Input: goodix - use generic touchscreen_properties (diff) | |
| parent | Linux 4.15 (diff) | |
| download | linux-10a558374f3751cf4eb55143008975641dfc2cf4.tar.xz linux-10a558374f3751cf4eb55143008975641dfc2cf4.zip | |
Merge tag 'v4.15' into next
Sync with mainline to get in trackpoint updates and other changes.
Diffstat (limited to 'drivers/gpio/gpio-lynxpoint.c')
| -rw-r--r-- | drivers/gpio/gpio-lynxpoint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-lynxpoint.c b/drivers/gpio/gpio-lynxpoint.c index fbd393b46ce0..1e557b10d73e 100644 --- a/drivers/gpio/gpio-lynxpoint.c +++ b/drivers/gpio/gpio-lynxpoint.c @@ -255,7 +255,7 @@ static void lp_gpio_irq_handler(struct irq_desc *desc) mask = BIT(pin); /* Clear before handling so we don't lose an edge */ outl(mask, reg); - irq = irq_find_mapping(lg->chip.irqdomain, base + pin); + irq = irq_find_mapping(lg->chip.irq.domain, base + pin); generic_handle_irq(irq); } } |