From: Sven Peter <sven@kernel.org>
To: Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
Dan Carpenter <dan.carpenter@linaro.org>,
Sven Peter <sven@kernel.org>
Subject: [PATCH] usb: typec: tipd: Fix error handling in cd321x_read_data_status
Date: Sat, 20 Sep 2025 12:28:03 +0000 [thread overview]
Message-ID: <20250920-tipd-fix-v1-1-49886d4f081d@kernel.org> (raw)
Right now cd321x_read_data_status always returns true even if it
encounters any errors: tps6598x_read_data_status returns a boolean but
we treated it as an errno and then we have a bunch of dev_errs in case
tps6598x_block_read fails but just continue along and return true.
Fix that to correctly report errors to the callee.
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/linux-usb/aMvWJo3IkClmFoAA@stanley.mountain/
Signed-off-by: Sven Peter <sven@kernel.org>
---
drivers/usb/typec/tipd/core.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
index 2b1049c9a6f3c4300f4a25a97fe502c47e82a134..d0c86347251c5cc19a9b377550c00c27966f8329 100644
--- a/drivers/usb/typec/tipd/core.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -577,30 +577,36 @@ static bool cd321x_read_data_status(struct tps6598x *tps)
int ret;
ret = tps6598x_read_data_status(tps);
- if (ret < 0)
+ if (!ret)
return false;
if (tps->data_status & TPS_DATA_STATUS_DP_CONNECTION) {
ret = tps6598x_block_read(tps, TPS_REG_DP_SID_STATUS,
&cd321x->dp_sid_status, sizeof(cd321x->dp_sid_status));
- if (ret)
+ if (ret) {
dev_err(tps->dev, "Failed to read DP SID Status: %d\n",
ret);
+ return false;
+ }
}
if (tps->data_status & TPS_DATA_STATUS_TBT_CONNECTION) {
ret = tps6598x_block_read(tps, TPS_REG_INTEL_VID_STATUS,
&cd321x->intel_vid_status, sizeof(cd321x->intel_vid_status));
- if (ret)
+ if (ret) {
dev_err(tps->dev, "Failed to read Intel VID Status: %d\n", ret);
+ return false;
+ }
}
if (tps->data_status & CD321X_DATA_STATUS_USB4_CONNECTION) {
ret = tps6598x_block_read(tps, TPS_REG_USB4_STATUS,
&cd321x->usb4_status, sizeof(cd321x->usb4_status));
- if (ret)
+ if (ret) {
dev_err(tps->dev,
"Failed to read USB4 Status: %d\n", ret);
+ return false;
+ }
}
return true;
---
base-commit: a4e143636d5def935dd461539b67b61287a8dfef
change-id: 20250920-tipd-fix-0c50f9f99a5a
Best regards,
--
Sven Peter <sven@kernel.org>
next reply other threads:[~2025-09-20 12:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-20 12:28 Sven Peter [this message]
2025-09-22 13:52 ` [PATCH] usb: typec: tipd: Fix error handling in cd321x_read_data_status Heikki Krogerus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250920-tipd-fix-v1-1-49886d4f081d@kernel.org \
--to=sven@kernel.org \
--cc=dan.carpenter@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.