Commit ccf9af8b authored by Mohammed Anees's avatar Mohammed Anees Committed by Jonathan Cameron

iioc: dac: ltc2664: Fix span variable usage in ltc2664_channel_config()

In the current implementation of the ltc2664_channel_config() function,
a variable named span is declared and initialized to 0, intended to
capture the return value of the ltc2664_set_span() function. However,
the output of ltc2664_set_span() is directly assigned to chan->span,
leaving span unchanged. As a result, when the function later checks
if (span < 0), this condition will never trigger an error since
span remains 0, this flaw leads to ineffective error handling. Resolve
this issue by using the ret variable to get the return value and later
assign it if successful and remove unused span variable.

Fixes: 4cc2fc44 ("iio: dac: ltc2664: Add driver for LTC2664 and LTC2672")
Signed-off-by: default avatarMohammed Anees <pvmohammedanees2003@gmail.com>
Link: https://patch.msgid.link/20241005200435.25061-1-pvmohammedanees2003@gmail.com
Cc: <Stable@vger.kernel.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 27b6aa68
...@@ -516,7 +516,7 @@ static int ltc2664_channel_config(struct ltc2664_state *st) ...@@ -516,7 +516,7 @@ static int ltc2664_channel_config(struct ltc2664_state *st)
const struct ltc2664_chip_info *chip_info = st->chip_info; const struct ltc2664_chip_info *chip_info = st->chip_info;
struct device *dev = &st->spi->dev; struct device *dev = &st->spi->dev;
u32 reg, tmp[2], mspan; u32 reg, tmp[2], mspan;
int ret, span = 0; int ret;
mspan = LTC2664_MSPAN_SOFTSPAN; mspan = LTC2664_MSPAN_SOFTSPAN;
ret = device_property_read_u32(dev, "adi,manual-span-operation-config", ret = device_property_read_u32(dev, "adi,manual-span-operation-config",
...@@ -579,20 +579,21 @@ static int ltc2664_channel_config(struct ltc2664_state *st) ...@@ -579,20 +579,21 @@ static int ltc2664_channel_config(struct ltc2664_state *st)
ret = fwnode_property_read_u32_array(child, "output-range-microvolt", ret = fwnode_property_read_u32_array(child, "output-range-microvolt",
tmp, ARRAY_SIZE(tmp)); tmp, ARRAY_SIZE(tmp));
if (!ret && mspan == LTC2664_MSPAN_SOFTSPAN) { if (!ret && mspan == LTC2664_MSPAN_SOFTSPAN) {
chan->span = ltc2664_set_span(st, tmp[0] / 1000, ret = ltc2664_set_span(st, tmp[0] / 1000, tmp[1] / 1000, reg);
tmp[1] / 1000, reg); if (ret < 0)
if (span < 0) return dev_err_probe(dev, ret,
return dev_err_probe(dev, span,
"Failed to set span\n"); "Failed to set span\n");
chan->span = ret;
} }
ret = fwnode_property_read_u32_array(child, "output-range-microamp", ret = fwnode_property_read_u32_array(child, "output-range-microamp",
tmp, ARRAY_SIZE(tmp)); tmp, ARRAY_SIZE(tmp));
if (!ret) { if (!ret) {
chan->span = ltc2664_set_span(st, 0, tmp[1] / 1000, reg); ret = ltc2664_set_span(st, 0, tmp[1] / 1000, reg);
if (span < 0) if (ret < 0)
return dev_err_probe(dev, span, return dev_err_probe(dev, ret,
"Failed to set span\n"); "Failed to set span\n");
chan->span = ret;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment