Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08c6e8cc authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Wolfram Sang
Browse files

i2c: designware-pci: use IRQF_COND_SUSPEND flag 



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>
parent 83c60158

drivers/i2c/busses/i2c-designware-core.c

+2 −1
Original line number Diff line number Diff line
@@ -874,7 +874,8 @@ int i2c_dw_probe(struct dw_i2c_dev *dev) 
	i2c_set_adapdata(adap, 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);

	if (r) {

		dev_err(dev->dev, "failure requesting irq %i: %d\n",