Skip to content

Commit f8f2390

Browse files
Dan Carpentermehmetb0
authored andcommitted
usb: typec: tcpm/tcpci_maxim: fix error code in max_contaminant_read_resistance_kohm()
BugLink: https://bugs.launchpad.net/bugs/2106770 commit b9711ff upstream. 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 <stable@kernel.org> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Reviewed-by: André Draszik <andre.draszik@linaro.org> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Link: https://lore.kernel.org/r/f1bf3768-419e-40dd-989c-f7f455d6c824@stanley.mountain Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com> Signed-off-by: Mehmet Basaran <mehmet.basaran@canonical.com>
1 parent 72635fe commit f8f2390

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
@@ -137,7 +137,7 @@ static int max_contaminant_read_resistance_kohm(struct max_tcpci_chip *chip,
137137

138138
mv = max_contaminant_read_adc_mv(chip, channel, sleep_msec, raw, true);
139139
if (mv < 0)
140-
return ret;
140+
return mv;
141141

142142
/* OVP enable */
143143
ret = regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL2, CCOVPDIS, 0);
@@ -159,7 +159,7 @@ static int max_contaminant_read_resistance_kohm(struct max_tcpci_chip *chip,
159159

160160
mv = max_contaminant_read_adc_mv(chip, channel, sleep_msec, raw, true);
161161
if (mv < 0)
162-
return ret;
162+
return mv;
163163
/* Disable current source */
164164
ret = regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL2, SBURPCTRL, 0);
165165
if (ret < 0)

0 commit comments

Comments
 (0)