Commit c18fba23 authored Nov 12, 2015 by Grygorii Strashko Committed by Wolfram Sang Nov 20, 2015

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: 3fffd128 ("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

parent d0fe5258

drivers/i2c/i2c-core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message