From: Ethan Tidmore <ethantidmore06@gmail.com>
To: Jonathan Cameron <jic23@kernel.org>, Andy Shevchenko <andy@kernel.org>
Cc: "David Lechner" <dlechner@baylibre.com>,
"Nuno Sá" <nuno.sa@analog.com>,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
"Ethan Tidmore" <ethantidmore06@gmail.com>,
"Andy Shevchenko" <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v5 05/10] iio: light: gp2ap020a00f: Fix possible error swallow
Date: Sun, 22 Feb 2026 21:40:15 -0600 [thread overview]
Message-ID: <20260223034020.27625-6-ethantidmore06@gmail.com> (raw)
In-Reply-To: <20260223034020.27625-1-ethantidmore06@gmail.com>
Move error check into for loop in gp2ap020a00f_buffer_postenable() and
gp2ap020a00f_buffer_predisable(), this fixes a possible error swallow.
Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Ethan Tidmore <ethantidmore06@gmail.com>
---
v5:
- Split this patch from the patch number 4, to keep bug fix separate
from style fix.
drivers/iio/light/gp2ap020a00f.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a00f.c
index 6b283b52698f..d2156e133b75 100644
--- a/drivers/iio/light/gp2ap020a00f.c
+++ b/drivers/iio/light/gp2ap020a00f.c
@@ -1339,7 +1339,7 @@ static const struct iio_info gp2ap020a00f_info = {
static int gp2ap020a00f_buffer_postenable(struct iio_dev *indio_dev)
{
struct gp2ap020a00f_data *data = iio_priv(indio_dev);
- int i, err = 0;
+ int i, err;
guard(mutex)(&data->lock);
@@ -1366,11 +1366,10 @@ static int gp2ap020a00f_buffer_postenable(struct iio_dev *indio_dev)
GP2AP020A00F_CMD_TRIGGER_PROX_EN);
break;
}
+ if (err)
+ return err;
}
- if (err < 0)
- return err;
-
data->buffer = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
if (!data->buffer)
return -ENOMEM;
@@ -1381,7 +1380,7 @@ static int gp2ap020a00f_buffer_postenable(struct iio_dev *indio_dev)
static int gp2ap020a00f_buffer_predisable(struct iio_dev *indio_dev)
{
struct gp2ap020a00f_data *data = iio_priv(indio_dev);
- int i, err = 0;
+ int i, err;
guard(mutex)(&data->lock);
@@ -1400,11 +1399,10 @@ static int gp2ap020a00f_buffer_predisable(struct iio_dev *indio_dev)
GP2AP020A00F_CMD_TRIGGER_PROX_DIS);
break;
}
+ if (err)
+ return err;
}
- if (err)
- return err;
-
kfree(data->buffer);
return 0;
}
--
2.53.0
next prev parent reply other threads:[~2026-02-23 3:40 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-23 3:40 [PATCH v5 00/10] General clean up and bug fixes Ethan Tidmore
2026-02-23 3:40 ` [PATCH v5 01/10] iio: light: gp2ap020a00f: simplify locking with guard() Ethan Tidmore
2026-02-23 11:54 ` Andy Shevchenko
2026-02-23 3:40 ` [PATCH v5 02/10] iio: light: gp2ap020a00f: correct return type to int Ethan Tidmore
2026-02-23 3:40 ` [PATCH v5 03/10] iio: light: gp2ap020a00f: Use correct types for 16-bit LE data Ethan Tidmore
2026-02-23 3:40 ` [PATCH v5 04/10] iio: light: gp2ap020a00f: Return directly from the switch cases Ethan Tidmore
2026-02-23 12:00 ` Andy Shevchenko
2026-02-23 3:40 ` Ethan Tidmore [this message]
2026-02-23 12:05 ` [PATCH v5 05/10] iio: light: gp2ap020a00f: Fix possible error swallow Andy Shevchenko
2026-02-23 21:15 ` Jonathan Cameron
2026-02-23 3:40 ` [PATCH v5 06/10] iio: light: gp2ap020a00f: Replace custom implementation of min() Ethan Tidmore
2026-02-23 3:40 ` [PATCH v5 07/10] iio: light: gp2ap020a00f: Use temporary variable for struct device Ethan Tidmore
2026-02-23 3:40 ` [PATCH v5 08/10] iio: light: gp2ap020a00f: Explicitly use string literal for driver name Ethan Tidmore
2026-02-23 3:40 ` [PATCH v5 09/10] iio: light: gp2ap020a00f: Remove trailing comma in termination entry Ethan Tidmore
2026-02-23 3:40 ` [PATCH v5 10/10] iio: light: gp2ap020a00f: Join some lines of code to be a single line Ethan Tidmore
2026-02-23 12:16 ` [PATCH v5 00/10] General clean up and bug fixes Andy Shevchenko
2026-02-23 12:17 ` Andy Shevchenko
2026-02-23 21:18 ` Jonathan Cameron
2026-02-24 9:45 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260223034020.27625-6-ethantidmore06@gmail.com \
--to=ethantidmore06@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=andy@kernel.org \
--cc=dlechner@baylibre.com \
--cc=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nuno.sa@analog.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox