From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring Subject: Re: [PATCH] of/i2c: call i2c_verify_client from of_find_i2c_device_by_node Date: Mon, 23 Apr 2012 08:00:12 -0500 Message-ID: <4F95525C.9020600@gmail.com> References: <1334688135-8355-1-git-send-email-swarren@wwwdotorg.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1334688135-8355-1-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> Sender: linux-i2c-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Stephen Warren Cc: Grant Likely , Ben Dooks , Wolfram Sang , devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-i2c@vger.kernel.org On 04/17/2012 01:42 PM, Stephen Warren wrote: > From: Stephen Warren > > i2c_bus_type may contain both I2C clients and I2C adapters. Fix > of_find_i2c_device_by_node to call i2c_verify_client to ensure that it > only returns non-NULL of I2C clients. > > Signed-off-by: Stephen Warren Acked-by: Rob Herring > --- > Note: This is a dependency for the pinctrl I2C bus mux I will send in a > minute. It'd probably be easiest to merge this through the I2C tree. > It might also be useful to put this patch (and the others I'll send) in > a separate tree so it can be merged into any SoC trees that wish to use > this new feature. > > drivers/of/of_i2c.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/of/of_i2c.c b/drivers/of/of_i2c.c > index f37fbeb..0684887 100644 > --- a/drivers/of/of_i2c.c > +++ b/drivers/of/of_i2c.c > @@ -90,7 +90,7 @@ struct i2c_client *of_find_i2c_device_by_node(struct device_node *node) > if (!dev) > return NULL; > > - return to_i2c_client(dev); > + return i2c_verify_client(dev); > } > EXPORT_SYMBOL(of_find_i2c_device_by_node); >