1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 527d51319f3c..b995502400b8 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -866,8 +866,9 @@ EXPORT_SYMBOL(i2c_detach_client);
  */
 struct i2c_client *i2c_use_client(struct i2c_client *client)
 {
-        get_device(&client->dev);
-        return client;
+        if (client && get_device(&client->dev))
+                return client;
+        return NULL;
 }
 EXPORT_SYMBOL(i2c_use_client);
 
@@ -879,7 +880,8 @@ EXPORT_SYMBOL(i2c_use_client);
  */
 void i2c_release_client(struct i2c_client *client)
 {
-        put_device(&client->dev);
+        if (client)
+                put_device(&client->dev);
 }
 EXPORT_SYMBOL(i2c_release_client);