From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jean Delvare Subject: Re: [PATCH] i2c: Keep client->driver and client->dev.driver in sync Date: Sun, 9 Mar 2008 11:16:26 +0100 Message-ID: <20080309111626.1d531cd4@hyperion.delvare> References: <20080308214911.5344eba9@hyperion.delvare> <200803081312.36524.david-b@pacbell.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <200803081312.36524.david-b-yBeKhBN/0LDR7s880joybQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: i2c-bounces-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org Errors-To: i2c-bounces-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org To: David Brownell Cc: Linux I2C List-Id: linux-i2c@vger.kernel.org Hi David, On Sat, 8 Mar 2008 13:12:36 -0800, David Brownell wrote: > The only issue I have is that code which the driver probe() > calls may expect client->driver to be set, but it won't be... > > While I'd rather see client->driver vanish, in this case I'd > just suggest leaving the early assignment, and nulling it out > on error (instead of assigning it on success). Oh well, that's exactly what Hans' patch did originally, I changed it to make the code more simple, but if you think it is better that way, I'll revert this change of mine. Here you go: From: Hans Verkuil Ensure that client->driver is set to NULL if the probe() returns an error (this keeps client->driver and client->dev.driver in sync). Signed-off-by: Hans Verkuil Signed-off-by: Jean Delvare --- drivers/i2c/i2c-core.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- linux-2.6.25-rc4.orig/drivers/i2c/i2c-core.c 2008-03-08 17:57:52.000000000 +0100 +++ linux-2.6.25-rc4/drivers/i2c/i2c-core.c 2008-03-09 11:03:53.000000000 +0100 @@ -90,12 +90,16 @@ static int i2c_device_probe(struct devic { struct i2c_client *client = to_i2c_client(dev); struct i2c_driver *driver = to_i2c_driver(dev->driver); + int status; if (!driver->probe) return -ENODEV; client->driver = driver; dev_dbg(dev, "probe\n"); - return driver->probe(client); + status = driver->probe(client); + if (status) + client->driver = NULL; + return status; } static int i2c_device_remove(struct device *dev) -- Jean Delvare _______________________________________________ i2c mailing list i2c-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org http://lists.lm-sensors.org/mailman/listinfo/i2c