diff options
| author |   Grygorii Strashko <grygorii.strashko@ti.com> | 2015-11-12 15:42:26 +0200 |
|---|---|---|
| committer |   Wolfram Sang <wsa@the-dreams.de> | 2015-11-20 16:19:08 +0100 |
| commit | c18fba23061f16dde128e10d4869ba4e88e0e81a (patch) | |
| tree | b90fd74b78ef348540cd3f6c24ce6ce6df72fbe3 /drivers/i2c/i2c-core.c | |
| parent | i2c: xiic: Prevent concurrent running of the IRQ handler and __xiic_start_xfer() (diff) | |
| download | wireguard-linux-c18fba23061f16dde128e10d4869ba4e88e0e81a.tar.xz wireguard-linux-c18fba23061f16dde128e10d4869ba4e88e0e81a.zip | |
i2c: fix wakeup irq parsing
This patch fixes obvious copy-past error in wake up irq parsing
code which leads to the fact that dev_pm_set_wake_irq() will
be called with wrong IRQ number when "wakeup" IRQ is not
defined in DT.
Fixes: 3fffd1283927 ("i2c: allow specifying separate wakeup interrupt in device tree")
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Cc: <stable@vger.kernel.org> # v4.3
Diffstat (limited to 'drivers/i2c/i2c-core.c')
| -rw-r--r-- | drivers/i2c/i2c-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 040af5cc8143..ba8eb087f224 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -715,7 +715,7 @@ static int i2c_device_probe(struct device *dev) if (wakeirq > 0 && wakeirq != client->irq) status = dev_pm_set_dedicated_wake_irq(dev, wakeirq); else if (client->irq > 0) - status = dev_pm_set_wake_irq(dev, wakeirq); + status = dev_pm_set_wake_irq(dev, client->irq); else status = 0; |