Skip to content

Commit e66d189

Browse files
svenpeter42jannau
authored andcommitted
usb: typec: tipd: Fix error handling in cd321x_read_data_status
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>
1 parent 04a093d commit e66d189

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

drivers/usb/typec/tipd/core.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -577,30 +577,36 @@ static bool cd321x_read_data_status(struct tps6598x *tps)
577577
int ret;
578578

579579
ret = tps6598x_read_data_status(tps);
580-
if (ret < 0)
580+
if (!ret)
581581
return false;
582582

583583
if (tps->data_status & TPS_DATA_STATUS_DP_CONNECTION) {
584584
ret = tps6598x_block_read(tps, TPS_REG_DP_SID_STATUS,
585585
&cd321x->dp_sid_status, sizeof(cd321x->dp_sid_status));
586-
if (ret)
586+
if (ret) {
587587
dev_err(tps->dev, "Failed to read DP SID Status: %d\n",
588588
ret);
589+
return false;
590+
}
589591
}
590592

591593
if (tps->data_status & TPS_DATA_STATUS_TBT_CONNECTION) {
592594
ret = tps6598x_block_read(tps, TPS_REG_INTEL_VID_STATUS,
593595
&cd321x->intel_vid_status, sizeof(cd321x->intel_vid_status));
594-
if (ret)
596+
if (ret) {
595597
dev_err(tps->dev, "Failed to read Intel VID Status: %d\n", ret);
598+
return false;
599+
}
596600
}
597601

598602
if (tps->data_status & CD321X_DATA_STATUS_USB4_CONNECTION) {
599603
ret = tps6598x_block_read(tps, TPS_REG_USB4_STATUS,
600604
&cd321x->usb4_status, sizeof(cd321x->usb4_status));
601-
if (ret)
605+
if (ret) {
602606
dev_err(tps->dev,
603607
"Failed to read USB4 Status: %d\n", ret);
608+
return false;
609+
}
604610
}
605611

606612
return true;

0 commit comments

Comments
 (0)