[PATCH] iio: ccs811: Deassert WAKE GPIO on error paths

[PATCH] iio: ccs811: Deassert WAKE GPIO on error paths

[Nikhil Gautam]

Ensure the WAKE GPIO is deasserted when status polling fails or
the data-ready timeout expires. Early returns could leave WAKE asserted,
preventing the sensor from returning to its low-power state and
potentially disrupting subsequent I2C transactions.

Route error paths through a common cleanup label to ensure WAKE is
deasserted before returning.

Signed-off-by: Nikhil Gautam <nikhilgtr@gmail.com>
---
 drivers/iio/chemical/ccs811.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/iio/chemical/ccs811.c b/drivers/iio/chemical/ccs811.c
index 998c9239c4c7..94c83937d1d7 100644
--- a/drivers/iio/chemical/ccs811.c
+++ b/drivers/iio/chemical/ccs811.c
@@ -198,20 +198,22 @@ static int ccs811_get_measurement(struct ccs811_data *data)
 	while (tries-- > 0) {
 		ret = i2c_smbus_read_byte_data(data->client, CCS811_STATUS);
 		if (ret < 0)
-			return ret;
+			goto out;
 
 		if ((ret & CCS811_STATUS_DATA_READY) || tries == 0)
 			break;
 		msleep(100);
 	}
-	if (!(ret & CCS811_STATUS_DATA_READY))
-		return -EIO;
+	if (!(ret & CCS811_STATUS_DATA_READY)) {
+		ret = -EIO;
+		goto out;
+	}
 
 	ret = i2c_smbus_read_i2c_block_data(data->client,
 					    CCS811_ALG_RESULT_DATA, 8,
 					    (char *)&data->buffer);
+out:
 	ccs811_set_wakeup(data, false);
-
 	return ret;
 }
 
-- 
2.39.5

Re: [PATCH] iio: ccs811: Deassert WAKE GPIO on error paths

[Joshua Crofts]

On Wed, 14 Oct 2026 20:52:50 +0530
Nikhil Gautam <nikhilgtr@gmail.com> wrote:

> Ensure the WAKE GPIO is deasserted when status polling fails or
> the data-ready timeout expires. Early returns could leave WAKE asserted,
> preventing the sensor from returning to its low-power state and
> potentially disrupting subsequent I2C transactions.
> 
> Route error paths through a common cleanup label to ensure WAKE is
> deasserted before returning.
> 
> Signed-off-by: Nikhil Gautam <nikhilgtr@gmail.com>

Please add a Fixes tag.

...

>  	ret = i2c_smbus_read_i2c_block_data(data->client,
>  					    CCS811_ALG_RESULT_DATA, 8,
>  					    (char *)&data->buffer);
> +out:
>  	ccs811_set_wakeup(data, false);
> -

Keep the blank line.

>  	return ret;
>  }
>  


Otherwise,

Reviewed-by: Joshua Crofts <joshua.crofts1@gmail.com>

-- 
Kind regards,
Joshua Crofts

Re: [PATCH] iio: ccs811: Deassert WAKE GPIO on error paths

[Nikhil Gautam]

Hi Joshua,

Thanks for the review.

> Please add a Fixes tag.
>
> ...
Sure, will add Fixes tag in next version
>>   	ret = i2c_smbus_read_i2c_block_data(data->client,
>>   					    CCS811_ALG_RESULT_DATA, 8,
>>   					    (char *)&data->buffer);
>> +out:
>>   	ccs811_set_wakeup(data, false);
>> -
> Keep the blank line.
Noted.
> Otherwise,
>
> Reviewed-by: Joshua Crofts <joshua.crofts1@gmail.com>
Regards,
Nikhil