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

torvalds · torvalds · commit 09d35919b06e · 2015-03-12T09:50:45.000-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"
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -679,9 +679,6 @@ static int i2c_device_remove(struct device *dev)`
`679`	`679`	`status = driver->remove(client);`
`680`	`680`	`}`
`681`	`681`
`682`		`- if (dev->of_node)`
`683`		`- irq_dispose_mapping(client->irq);`
`684`		`-`
`685`	`682`	`dev_pm_domain_detach(&client->dev, true);`
`686`	`683`	`return status;`
`687`	`684`	`}`