Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

09d35919 · Linus Torvalds <[email protected]> · 2015-03-12 09:50:45 -07:00

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"

Commit: 09d35919b06e8508b51ee8a643a67b56f7bea0dd
Parents: 91e9134e · a4944572

Merge commit. Changes below are compared with the first parent: 91e9134e.

Changes

1 files changed · +0 −3

File	Status	Add	Del	Content
drivers/i2c/i2c-core.c	modified	+0	−3	View file

drivers/i2c/i2c-core.c

View file

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