diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-20 15:52:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-20 15:52:52 -0800 |
| commit | 81051f9120560059ba7055e974e42bd05a67de6d (patch) | |
| tree | be004c304940689869441dc8169f9559128e1c10 /drivers/i2c/i2c-core.c | |
| parent | 116dfe5e88cd0c9368bf0db28708fff6b549951f (diff) | |
| parent | cdc5a3110e7c3ae793f367285789a6bc39c962dc (diff) | |
| download | linux-81051f9120560059ba7055e974e42bd05a67de6d.tar.gz linux-81051f9120560059ba7055e974e42bd05a67de6d.tar.bz2 linux-81051f9120560059ba7055e974e42bd05a67de6d.zip | |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"A few bugfixes and one PCI ID addition from I2C"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: i801: add Intel Lewisburg device IDs
i2c: fix wakeup irq parsing
i2c: xiic: Prevent concurrent running of the IRQ handler and __xiic_start_xfer()
i2c: Revert "i2c: xiic: Do not reset controller before every transfer"
i2c: imx: fix a compiling error
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; |