sound/soc/codecs/wcd-common.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
Currently the error check from the call to wcd_get_micbias_val is always
false because an u32 unsigned int in common->micb_vout[i] is being used to
to perform the less than zero error check. Fix this by using the int
variable ret to perform the check.
Fixes: 4f16b6351bbf ("ASoC: codecs: wcd: add common helper for wcd codecs")
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
---
sound/soc/codecs/wcd-common.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/wcd-common.c b/sound/soc/codecs/wcd-common.c
index 9bbfda828377..9fd3965ed540 100644
--- a/sound/soc/codecs/wcd-common.c
+++ b/sound/soc/codecs/wcd-common.c
@@ -65,9 +65,12 @@ int wcd_dt_parse_micbias_info(struct wcd_common *common)
int i;
for (i = 0; i < common->max_bias; i++) {
- common->micb_vout[i] = wcd_get_micbias_val(common->dev, i + 1, &common->micb_mv[i]);
- if (common->micb_vout[i] < 0)
+ int ret;
+
+ ret = wcd_get_micbias_val(common->dev, i + 1, &common->micb_mv[i]);
+ if (ret < 0)
return -EINVAL;
+ common->micb_vout[i] = ret;
}
return 0;
--
2.51.0
On 9/24/25 11:33 AM, Colin Ian King wrote:
> Currently the error check from the call to wcd_get_micbias_val is always
> false because an u32 unsigned int in common->micb_vout[i] is being used to
> to perform the less than zero error check. Fix this by using the int
> variable ret to perform the check.
>
> Fixes: 4f16b6351bbf ("ASoC: codecs: wcd: add common helper for wcd codecs")
> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
> ---
Dan Carpenter sent exactly same fix yesterday:
https://www.spinics.net/lists/kernel/msg5855359.html
--srini
> sound/soc/codecs/wcd-common.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/codecs/wcd-common.c b/sound/soc/codecs/wcd-common.c
> index 9bbfda828377..9fd3965ed540 100644
> --- a/sound/soc/codecs/wcd-common.c
> +++ b/sound/soc/codecs/wcd-common.c
> @@ -65,9 +65,12 @@ int wcd_dt_parse_micbias_info(struct wcd_common *common)
> int i;
>
> for (i = 0; i < common->max_bias; i++) {
> - common->micb_vout[i] = wcd_get_micbias_val(common->dev, i + 1, &common->micb_mv[i]);
> - if (common->micb_vout[i] < 0)
> + int ret;
> +
> + ret = wcd_get_micbias_val(common->dev, i + 1, &common->micb_mv[i]);
> + if (ret < 0)
> return -EINVAL;
> + common->micb_vout[i] = ret;
> }
>
> return 0;
© 2016 - 2026 Red Hat, Inc.