github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 17:13:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

usb: typec: tipd: Fix error handling in cd321x_read_data_status

Browse Source 
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>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20250920-tipd-fix-v1-1-49886d4f081d@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sven Peter 2025-09-20 12:28:03 +00:00 committed by Greg Kroah-Hartman
parent 0e61e71538
commit 1c1b2a247c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/usb/typec/tipd/core.c
View File

@ -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;