Commit 8a36261c authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Kleber Sacilotto de Souza

i2c: designware-pci: use IRQF_COND_SUSPEND flag

BugLink: https://bugs.launchpad.net/bugs/1878246

commit 08c6e8cc upstream.

This is effectively reapplies the commit b0898fda ("i2c: designware-pci: use
IRQF_COND_SUSPEND flag") after the commit d80d1341 ("i2c: designware: Move
common probe code into i2c_dw_probe()"). Original message as follows.

The mentioned flag fixes a warning on Intel Edison board since one of the I2C
controller shares IRQ line with watchdog timer.

Fixes: d80d1341 (i2c: designware: Move common probe code into i2c_dw_probe())
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarIan May <ian.may@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent 2a7ca266
...@@ -873,7 +873,8 @@ int i2c_dw_probe(struct dw_i2c_dev *dev) ...@@ -873,7 +873,8 @@ int i2c_dw_probe(struct dw_i2c_dev *dev)
i2c_set_adapdata(adap, dev); i2c_set_adapdata(adap, dev);
i2c_dw_disable_int(dev); i2c_dw_disable_int(dev);
r = devm_request_irq(dev->dev, dev->irq, i2c_dw_isr, IRQF_SHARED, r = devm_request_irq(dev->dev, dev->irq, i2c_dw_isr,
IRQF_SHARED | IRQF_COND_SUSPEND,
dev_name(dev->dev), dev); dev_name(dev->dev), dev);
if (r) { if (r) {
dev_err(dev->dev, "failure requesting irq %i: %d\n", dev_err(dev->dev, "failure requesting irq %i: %d\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment