i2c: Make i2c_unregister_device() NULL-aware

[mirror_ubuntu-bionic-kernel.git] / drivers / i2c / i2c-core-base.c

diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 7b08f3446bfc035d36c3093af85ac52ed7323974..706164b4c5be46bf2f98aa5a8ddde44800eeae0e 100644 (file)
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -819,6 +819,8 @@ EXPORT_SYMBOL_GPL(i2c_new_device);
  */
 void i2c_unregister_device(struct i2c_client *client)
 {
+       if (!client)
+               return;
        if (client->dev.of_node)
                of_node_clear_flag(client->dev.of_node, OF_POPULATED);
        if (ACPI_COMPANION(&client->dev))
@@ -1436,8 +1438,7 @@ static int __unregister_client(struct device *dev, void *dummy)
 static int __unregister_dummy(struct device *dev, void *dummy)
 {
        struct i2c_client *client = i2c_verify_client(dev);
-       if (client)
-               i2c_unregister_device(client);
+       i2c_unregister_device(client);
        return 0;
 }