Skip to content

Commit

Permalink
drm/bridge: nxp-ptn3460: fix i2c_master_send() error checking
Browse files Browse the repository at this point in the history
The i2c_master_send/recv() functions return negative error codes or the
number of bytes that were able to be sent/received.  This code has
two problems.  1)  Instead of checking if all the bytes were sent or
received, it checks that at least one byte was sent or received.
2) If there was a partial send/receive then we should return a negative
error code but this code returns success.

Fixes: a9fe713 ("drm/bridge: Add PTN3460 bridge driver")
Cc: stable@vger.kernel.org
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Robert Foss <rfoss@kernel.org>
Signed-off-by: Robert Foss <rfoss@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/0cdc2dce-ca89-451a-9774-1482ab2f4762@moroto.mountain
  • Loading branch information
Dan Carpenter authored and Robert Foss committed Dec 4, 2023
1 parent f6d8a80 commit 9144379
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/gpu/drm/bridge/nxp-ptn3460.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ static int ptn3460_read_bytes(struct ptn3460_bridge *ptn_bridge, char addr,
ret = i2c_master_send(ptn_bridge->client, &addr, 1);
if (ret <= 0) {
DRM_ERROR("Failed to send i2c command, ret=%d\n", ret);
return ret;
return ret ?: -EIO;
}

ret = i2c_master_recv(ptn_bridge->client, buf, len);
if (ret <= 0) {
if (ret != len) {
DRM_ERROR("Failed to recv i2c data, ret=%d\n", ret);
return ret;
return ret < 0 ? ret : -EIO;
}

return 0;
Expand All @@ -78,9 +78,9 @@ static int ptn3460_write_byte(struct ptn3460_bridge *ptn_bridge, char addr,
buf[1] = val;

ret = i2c_master_send(ptn_bridge->client, buf, ARRAY_SIZE(buf));
if (ret <= 0) {
if (ret != ARRAY_SIZE(buf)) {
DRM_ERROR("Failed to send i2c command, ret=%d\n", ret);
return ret;
return ret < 0 ? ret : -EIO;
}

return 0;
Expand Down

0 comments on commit 9144379

Please sign in to comment.