OSDN Git Service

media: i2c: adv7180: convert to i2c_new_dummy_device
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Mon, 22 Jul 2019 17:26:00 +0000 (14:26 -0300)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Tue, 13 Aug 2019 14:45:33 +0000 (11:45 -0300)
Move from i2c_new_dummy() to i2c_new_dummy_device(), so we now get an
ERRPTR which we use in error handling.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/i2c/adv7180.c

index 6f3dc88..e780969 100644 (file)
@@ -1329,17 +1329,17 @@ static int adv7180_probe(struct i2c_client *client,
        }
 
        if (state->chip_info->flags & ADV7180_FLAG_MIPI_CSI2) {
-               state->csi_client = i2c_new_dummy(client->adapter,
+               state->csi_client = i2c_new_dummy_device(client->adapter,
                                ADV7180_DEFAULT_CSI_I2C_ADDR);
-               if (!state->csi_client)
-                       return -ENOMEM;
+               if (IS_ERR(state->csi_client))
+                       return PTR_ERR(state->csi_client);
        }
 
        if (state->chip_info->flags & ADV7180_FLAG_I2P) {
-               state->vpp_client = i2c_new_dummy(client->adapter,
+               state->vpp_client = i2c_new_dummy_device(client->adapter,
                                ADV7180_DEFAULT_VPP_I2C_ADDR);
-               if (!state->vpp_client) {
-                       ret = -ENOMEM;
+               if (IS_ERR(state->vpp_client)) {
+                       ret = PTR_ERR(state->vpp_client);
                        goto err_unregister_csi_client;
                }
        }