From: Wolfram Sang Date: Sat, 28 Jun 2008 18:31:52 +0000 (+0200) Subject: powerpc/mpc5200: Fix wrong 'no interrupt' handling in of_i2c X-Git-Tag: v2.6.27-rc1~222^2~26^2~5 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11d579ee0a19052a5a90ebfe0c39e7ed8ce8a9dc;p=linux-2.6 powerpc/mpc5200: Fix wrong 'no interrupt' handling in of_i2c If an I2C device node does not specify an interrupt, the .irq member of the board_info struct was set to -1. This caused crashes on following irq_dispose_mappings. Leave it NO_IRQ as returned from irq_of_parse_and_map. (Suggesting -1 as 'i2c-no-irq' used to be a bug in linux/i2c.h.) Signed-off-by: Wolfram Sang Acked-by: Sean MacLennan Signed-off-by: Grant Likely --- diff --git a/drivers/of/of_i2c.c b/drivers/of/of_i2c.c index 5c015d310d..344e1b03dd 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, } info.irq = irq_of_parse_and_map(node, 0); - if (info.irq == NO_IRQ) - info.irq = -1; if (of_find_i2c_driver(node, &info) < 0) { irq_dispose_mapping(info.irq);