diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2019-08-09 16:04:06 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-08-13 11:46:55 -0300 |
| commit | 34925d9f019ca5f2bbb2220bfd7bf353c61d8a27 (patch) | |
| tree | 42ddc50c5cd978ed829667f2646a9d5bdb4be875 | |
| parent | 2f822f1da08ac5c93e351e79d22920f08fa51baf (diff) | |
| download | linux-0-day-34925d9f019ca5f2bbb2220bfd7bf353c61d8a27.tar.gz linux-0-day-34925d9f019ca5f2bbb2220bfd7bf353c61d8a27.tar.xz | |
media: i2c: adv7842: convert to i2c_new_dummy_device
Move away from the to-be-removed i2c_new_dummy() to
i2c_new_dummy_device(). So, we now get an ERRPTR which we use in error
handling by printing the error code. To keep the rest of the driver
logic as is, internally a NULL ptr is still kept.
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>
| -rw-r--r-- | drivers/media/i2c/adv7842.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c index 11ab2df02dc70..ffc3d174c4a16 100644 --- a/drivers/media/i2c/adv7842.c +++ b/drivers/media/i2c/adv7842.c @@ -3400,9 +3400,12 @@ static struct i2c_client *adv7842_dummy_client(struct v4l2_subdev *sd, const cha return NULL; } - cp = i2c_new_dummy(client->adapter, io_read(sd, io_reg) >> 1); - if (!cp) - v4l2_err(sd, "register %s on i2c addr 0x%x failed\n", desc, addr); + cp = i2c_new_dummy_device(client->adapter, io_read(sd, io_reg) >> 1); + if (IS_ERR(cp)) { + v4l2_err(sd, "register %s on i2c addr 0x%x failed with %ld\n", + desc, addr, PTR_ERR(cp)); + cp = NULL; + } return cp; } |