Skip to content

Commit

Permalink
media: i2c: tc358746: fix ignoring read error in g_register callback
Browse files Browse the repository at this point in the history
[ Upstream commit 9d33802 ]

Currently we ignore the return value of tc358746_read() and return
alawys return 0 which is wrong. Fix this by returning the actual return
value of the read operation which is either 0 on success or an error
value.

Addresses-Coverity-ID: 1527254 ("Error handling issues")

Reported-by: coverity-bot <keescook+coverity-bot@chromium.org>
Fixes: 80a21da ("media: tc358746: add Toshiba TC358746 Parallel to CSI-2 bridge driver")
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Marco Felsch authored and gregkh committed Mar 10, 2023
1 parent a3905ae commit 04ec166
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/media/i2c/tc358746.c
Expand Up @@ -988,19 +988,20 @@ static int __maybe_unused
tc358746_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg)
{
struct tc358746 *tc358746 = to_tc358746(sd);
int err;

/* 32-bit registers starting from CLW_DPHYCONTTX */
reg->size = reg->reg < CLW_DPHYCONTTX_REG ? 2 : 4;

if (!pm_runtime_get_if_in_use(sd->dev))
return 0;

tc358746_read(tc358746, reg->reg, (u32 *)&reg->val);
err = tc358746_read(tc358746, reg->reg, (u32 *)&reg->val);

pm_runtime_mark_last_busy(sd->dev);
pm_runtime_put_sync_autosuspend(sd->dev);

return 0;
return err;
}

static int __maybe_unused
Expand Down

0 comments on commit 04ec166

Please sign in to comment.