projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'mkp-scsi/4.5/scsi-queue' into misc
[cascardo/linux.git]
/
drivers
/
i2c
/
i2c-core.c
diff --git
a/drivers/i2c/i2c-core.c
b/drivers/i2c/i2c-core.c
index
040af5c
..
ba8eb08
100644
(file)
--- 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,
wake
irq);
+ status = dev_pm_set_wake_irq(dev,
client->
irq);
else
status = 0;