summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-03-12 16:50:45 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2015-03-12 16:50:45 (GMT)
commit09d35919b06e8508b51ee8a643a67b56f7bea0dd (patch)
treecd0a76344f138ba3dc525220393c1bf7be9fb078
parent91e9134eda82b57952fdbdb0c5990a7a6609ff13 (diff)
parenta49445727014216703a3c28ccee4cef36d41571e (diff)
downloadlinux-09d35919b06e8508b51ee8a643a67b56f7bea0dd.tar.xz
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fix from Wolfram Sang: "An important bugfix for the I2C subsystem core" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: Revert "i2c: core: Dispose OF IRQ mapping at client removal time"
-rw-r--r--drivers/i2c/i2c-core.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 210cf48..edf274c 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -679,9 +679,6 @@ static int i2c_device_remove(struct device *dev)
status = driver->remove(client);
}
- if (dev->of_node)
- irq_dispose_mapping(client->irq);
-
dev_pm_domain_detach(&client->dev, true);
return status;
}