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"
This commit is contained in:
Linus Torvalds 2015-03-12 09:50:45 -07:00
commit 09d35919b0

View File

@ -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;
}