diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-12 09:50:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-12 09:50:45 -0700 |
| commit | 09d35919b06e8508b51ee8a643a67b56f7bea0dd (patch) | |
| tree | cd0a76344f138ba3dc525220393c1bf7be9fb078 | |
| parent | Merge tag 'pci-v4.0-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci (diff) | |
| parent | Revert "i2c: core: Dispose OF IRQ mapping at client removal time" (diff) | |
| download | linux-dev-09d35919b06e8508b51ee8a643a67b56f7bea0dd.tar.xz linux-dev-09d35919b06e8508b51ee8a643a67b56f7bea0dd.zip | |
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.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 210cf4874cb7..edf274cabe81 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; } |