From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: [PATCH] i2c: core: Fix probing of i2c slaves without interrupts Date: Wed, 26 Nov 2014 02:22:42 +0200 Message-ID: <1869027.VfW5YtiRHN@avalon> References: <1416224580-4782-1-git-send-email-geert+renesas@glider.be> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Return-path: In-Reply-To: <1416224580-4782-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Geert Uytterhoeven Cc: Laurent Pinchart , Wolfram Sang , linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: devicetree@vger.kernel.org Hi Geert, On Monday 17 November 2014 12:43:00 Geert Uytterhoeven wrote: > Since commit 2fd36c55264926e2 ("i2c: core: Map OF IRQ at probe time"), > i2c slaves without interrupts (e.g. da9210 and at24 on r8a7791/koelsch) > fail to probe: > > at24: probe of 2-0050 failed with error -22 > > da9210: probe of 6-0068 failed with error -22 > > This happens because the call to of_irq_get() in i2c_device_probe() > returns -EINVAL. > > If a device node does not have an "interrupts" property, > of_irq_parse_one() fails. Unlike irq_of_parse_and_map(), of_irq_get() > does not ignore errors from of_irq_parse_one(), but forwards them. > > Make i2c_device_probe() ignore all errors but -EPROBE_DEFER to fix this, > just like platform_get_irq() and platform_get_irq_byname() already do. Thank you for fixing my mistake. > Fixes: 2fd36c55264926e2 ("i2c: core: Map OF IRQ at probe time") > Signed-off-by: Geert Uytterhoeven Just for the record, even if it's too late, Acked-by: Laurent Pinchart > --- > drivers/i2c/i2c-core.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c > index a0768d6dffc28aae..cf830915713b387a 100644 > --- a/drivers/i2c/i2c-core.c > +++ b/drivers/i2c/i2c-core.c > @@ -629,8 +629,10 @@ static int i2c_device_probe(struct device *dev) > if (!client->irq && dev->of_node) { > int irq = of_irq_get(dev->of_node, 0); > > - if (irq < 0) > + if (irq == -EPROBE_DEFER) > return irq; > + if (irq < 0) > + irq = 0; > > client->irq = irq; > } -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html