[PATCH v2] iio: light: gp2ap020a00f: Correct return type to int

Ethan Tidmore posted 1 patch 1 month, 2 weeks ago
drivers/iio/light/gp2ap020a00f.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
[PATCH v2] iio: light: gp2ap020a00f: Correct return type to int
Posted by Ethan Tidmore 1 month, 2 weeks ago
The function gp2ap020a00f_get_thresh_reg() can return -EINVAL in
its error path. Yet, the function has return type of u8. Add error
checking for gp2ap020a00f_get_thresh_reg() return's value.

Fixes: 5d6a25bad035 ("iio:gp2ap020a00f: Switch to new event config interface")
Signed-off-by: Ethan Tidmore <ethantidmore06@gmail.com>
---
v2: 
- Fixed gp2ap020a00f_get_thresh_reg() parameter alignment.
- Removed unneeded whitespace between assignment and check.
 drivers/iio/light/gp2ap020a00f.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a00f.c
index c7df4b258e2c..d122730176a6 100644
--- a/drivers/iio/light/gp2ap020a00f.c
+++ b/drivers/iio/light/gp2ap020a00f.c
@@ -992,8 +992,8 @@ static irqreturn_t gp2ap020a00f_trigger_handler(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-static u8 gp2ap020a00f_get_thresh_reg(const struct iio_chan_spec *chan,
-					     enum iio_event_direction event_dir)
+static int gp2ap020a00f_get_thresh_reg(const struct iio_chan_spec *chan,
+				       enum iio_event_direction event_dir)
 {
 	switch (chan->type) {
 	case IIO_PROXIMITY:
@@ -1023,12 +1023,17 @@ static int gp2ap020a00f_write_event_val(struct iio_dev *indio_dev,
 	struct gp2ap020a00f_data *data = iio_priv(indio_dev);
 	bool event_en = false;
 	u8 thresh_val_id;
-	u8 thresh_reg_l;
+	int thresh_reg_l;
 	int err = 0;
 
 	mutex_lock(&data->lock);
 
 	thresh_reg_l = gp2ap020a00f_get_thresh_reg(chan, dir);
+	if (thresh_reg_l < 0) {
+		err = thresh_reg_l;
+		goto error_unlock;
+	}
+
 	thresh_val_id = GP2AP020A00F_THRESH_VAL_ID(thresh_reg_l);
 
 	if (thresh_val_id > GP2AP020A00F_THRESH_PH) {
@@ -1080,12 +1085,16 @@ static int gp2ap020a00f_read_event_val(struct iio_dev *indio_dev,
 				       int *val, int *val2)
 {
 	struct gp2ap020a00f_data *data = iio_priv(indio_dev);
-	u8 thresh_reg_l;
+	int thresh_reg_l;
 	int err = IIO_VAL_INT;
 
 	mutex_lock(&data->lock);
 
 	thresh_reg_l = gp2ap020a00f_get_thresh_reg(chan, dir);
+	if (thresh_reg_l < 0) {
+		err = thresh_reg_l;
+		goto error_unlock;
+	}
 
 	if (thresh_reg_l > GP2AP020A00F_PH_L_REG) {
 		err = -EINVAL;
-- 
2.53.0
Re: [PATCH v2] iio: light: gp2ap020a00f: Correct return type to int
Posted by Jonathan Cameron 1 month, 2 weeks ago
On Wed, 11 Feb 2026 14:06:54 -0600
Ethan Tidmore <ethantidmore06@gmail.com> wrote:

> The function gp2ap020a00f_get_thresh_reg() can return -EINVAL in
> its error path. Yet, the function has return type of u8. Add error
> checking for gp2ap020a00f_get_thresh_reg() return's value.
> 
> Fixes: 5d6a25bad035 ("iio:gp2ap020a00f: Switch to new event config interface")
> Signed-off-by: Ethan Tidmore <ethantidmore06@gmail.com>
Ah. I forgot to check for a v2.

See comments on v1.

Jonathan