diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-25 01:35:03 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-25 01:35:03 -0400 |
| commit | c174aff95642bcc830102becb9802adeb8f87a5a (patch) | |
| tree | 360ad80985487939be071bf0205cdaa5ca88155f /drivers | |
| parent | fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 (diff) | |
| parent | 79c28acb2b7d66ca48d23e1c8b5e9e043aa634f8 (diff) | |
Merge commit 'gcl/gcl-next'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/of_i2c.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/of/of_i2c.c b/drivers/of/of_i2c.c index 5c015d310d4a..344e1b03dd8b 100644 --- a/drivers/of/of_i2c.c +++ b/drivers/of/of_i2c.c | |||
| @@ -91,8 +91,6 @@ void of_register_i2c_devices(struct i2c_adapter *adap, | |||
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | info.irq = irq_of_parse_and_map(node, 0); | 93 | info.irq = irq_of_parse_and_map(node, 0); |
| 94 | if (info.irq == NO_IRQ) | ||
| 95 | info.irq = -1; | ||
| 96 | 94 | ||
| 97 | if (of_find_i2c_driver(node, &info) < 0) { | 95 | if (of_find_i2c_driver(node, &info) < 0) { |
| 98 | irq_dispose_mapping(info.irq); | 96 | irq_dispose_mapping(info.irq); |