Commit 09d35919 authored by Linus Torvalds's avatar Linus Torvalds

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"
parents 91e9134e a4944572
...@@ -679,9 +679,6 @@ static int i2c_device_remove(struct device *dev) ...@@ -679,9 +679,6 @@ static int i2c_device_remove(struct device *dev)
status = driver->remove(client); status = driver->remove(client);
} }
if (dev->of_node)
irq_dispose_mapping(client->irq);
dev_pm_domain_detach(&client->dev, true); dev_pm_domain_detach(&client->dev, true);
return status; return status;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment