Commit 50c3304a authored by Hans Verkuil's avatar Hans Verkuil Committed by Jean Delvare
Browse files

i2c: Keep client->driver and client->dev.driver in sync

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: default avatarHans Verkuil <>
Acked-by: default avatarDavid Brownell <>
Signed-off-by: default avatarJean Delvare <>
parent 5edc68b8
......@@ -90,12 +90,16 @@ static int i2c_device_probe(struct device *dev)
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)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment