Skip to content

Commit b9711ff

Browse files
Dan Carpentergregkh
authored andcommitted
usb: typec: tcpm/tcpci_maxim: fix error code in max_contaminant_read_resistance_kohm()
If max_contaminant_read_adc_mv() fails, then return the error code. Don't return zero. Fixes: 02b332a ("usb: typec: maxim_contaminant: Implement check_contaminant callback") Cc: stable <[email protected]> Signed-off-by: Dan Carpenter <[email protected]> Reviewed-by: André Draszik <[email protected]> Reviewed-by: Heikki Krogerus <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent e19852d commit b9711ff

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/usb/typec/tcpm/maxim_contaminant.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static int max_contaminant_read_resistance_kohm(struct max_tcpci_chip *chip,
135135

136136
mv = max_contaminant_read_adc_mv(chip, channel, sleep_msec, raw, true);
137137
if (mv < 0)
138-
return ret;
138+
return mv;
139139

140140
/* OVP enable */
141141
ret = regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL2, CCOVPDIS, 0);
@@ -157,7 +157,7 @@ static int max_contaminant_read_resistance_kohm(struct max_tcpci_chip *chip,
157157

158158
mv = max_contaminant_read_adc_mv(chip, channel, sleep_msec, raw, true);
159159
if (mv < 0)
160-
return ret;
160+
return mv;
161161
/* Disable current source */
162162
ret = regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL2, SBURPCTRL, 0);
163163
if (ret < 0)

0 commit comments

Comments
 (0)