From 7ffcccbf7fb48239e188730ef2099c36a2e25edb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 27 Jan 2024 15:40:23 -0800 Subject: [PATCH] 4.19-stable patches added patches: drm-bridge-nxp-ptn3460-simplify-some-error-checking.patch --- ...ptn3460-simplify-some-error-checking.patch | 62 +++++++++++++++++++ queue-4.19/series | 1 + 2 files changed, 63 insertions(+) create mode 100644 queue-4.19/drm-bridge-nxp-ptn3460-simplify-some-error-checking.patch diff --git a/queue-4.19/drm-bridge-nxp-ptn3460-simplify-some-error-checking.patch b/queue-4.19/drm-bridge-nxp-ptn3460-simplify-some-error-checking.patch new file mode 100644 index 00000000000..7d889ffe176 --- /dev/null +++ b/queue-4.19/drm-bridge-nxp-ptn3460-simplify-some-error-checking.patch @@ -0,0 +1,62 @@ +From 28d3d0696688154cc04983f343011d07bf0508e4 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Wed, 6 Dec 2023 18:05:15 +0300 +Subject: drm/bridge: nxp-ptn3460: simplify some error checking + +From: Dan Carpenter + +commit 28d3d0696688154cc04983f343011d07bf0508e4 upstream. + +The i2c_master_send/recv() functions return negative error codes or +they return "len" on success. So the error handling here can be written +as just normal checks for "if (ret < 0) return ret;". No need to +complicate things. + +Btw, in this code the "len" parameter can never be zero, but even if +it were, then I feel like this would still be the best way to write it. + +Fixes: 914437992876 ("drm/bridge: nxp-ptn3460: fix i2c_master_send() error checking") +Suggested-by: Neil Armstrong +Signed-off-by: Dan Carpenter +Reviewed-by: Robert Foss +Signed-off-by: Robert Foss +Link: https://patchwork.freedesktop.org/patch/msgid/04242630-42d8-4920-8c67-24ac9db6b3c9@moroto.mountain +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +--- a/drivers/gpu/drm/bridge/nxp-ptn3460.c ++++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c +@@ -64,15 +64,15 @@ static int ptn3460_read_bytes(struct ptn + int ret; + + ret = i2c_master_send(ptn_bridge->client, &addr, 1); +- if (ret <= 0) { ++ if (ret < 0) { + DRM_ERROR("Failed to send i2c command, ret=%d\n", ret); +- return ret ?: -EIO; ++ return ret; + } + + ret = i2c_master_recv(ptn_bridge->client, buf, len); +- if (ret != len) { ++ if (ret < 0) { + DRM_ERROR("Failed to recv i2c data, ret=%d\n", ret); +- return ret < 0 ? ret : -EIO; ++ return ret; + } + + return 0; +@@ -88,9 +88,9 @@ static int ptn3460_write_byte(struct ptn + buf[1] = val; + + ret = i2c_master_send(ptn_bridge->client, buf, ARRAY_SIZE(buf)); +- if (ret != ARRAY_SIZE(buf)) { ++ if (ret < 0) { + DRM_ERROR("Failed to send i2c command, ret=%d\n", ret); +- return ret < 0 ? ret : -EIO; ++ return ret; + } + + return 0; diff --git a/queue-4.19/series b/queue-4.19/series index 0c78102fb30..3c6f9acce5f 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -39,3 +39,4 @@ netfilter-nf_tables-reject-queue-drop-verdict-parameters.patch gpiolib-acpi-ignore-touchpad-wakeup-on-gpd-g1619-04.patch drm-don-t-unref-the-same-fb-many-times-by-mistake-due-to-deadlock-handling.patch drm-bridge-nxp-ptn3460-fix-i2c_master_send-error-checking.patch +drm-bridge-nxp-ptn3460-simplify-some-error-checking.patch -- 2.47.3