linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Cameron <jic23@kernel.org>
To: Jiri Valek - 2N <valek@2n.cz>
Cc: Lars-Peter Clausen <lars@metafoo.de>,
	Gwendal Grignou <gwendal@chromium.org>,
	<linux-iio@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	Alexander Koch <mail@alexanderkoch.net>,
	Andreas Dannenberg <dannenberg@ti.com>
Subject: Re: [PATCH] iio: light: opt3001: Fixed timeout error when 0 lux
Date: Sun, 3 Oct 2021 16:43:55 +0100	[thread overview]
Message-ID: <20211003164355.3757c44f@jic23-huawei> (raw)
In-Reply-To: <20210926145514.5395fdc6@jic23-huawei>

On Sun, 26 Sep 2021 14:55:14 +0100
Jonathan Cameron <jic23@kernel.org> wrote:

> On Mon, 20 Sep 2021 14:53:48 +0200
> Jiri Valek - 2N <valek@2n.cz> wrote:
> 
> > Reading from sensor returned timeout error under
> > zero light conditions.
> > 
> > Signed-off-by: Jiri Valek - 2N <valek@2n.cz>  
> Hi Jiri,
> 
> Thanks for this. Looks good to me though I'll leave a little longer for others
> to take a look.
> 
> Does need a fixes tag though so we know how far to backport it.
> I think it should be
> 
> Fixes: ac663db3678a ("iio: light: opt3001: enable operation w/o IRQ")
> 
> +Cc Alexander and Andreas

Applied to the fixes-togreg branch of iio.git and marked for stable.

Thanks,

Jonathan

> 
> > ---
> >  drivers/iio/light/opt3001.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/iio/light/opt3001.c b/drivers/iio/light/opt3001.c
> > index 52963da401a7..1880bd5bb258 100644
> > --- a/drivers/iio/light/opt3001.c
> > +++ b/drivers/iio/light/opt3001.c
> > @@ -276,6 +276,8 @@ static int opt3001_get_lux(struct opt3001 *opt, int *val, int *val2)
> >  		ret = wait_event_timeout(opt->result_ready_queue,
> >  				opt->result_ready,
> >  				msecs_to_jiffies(OPT3001_RESULT_READY_LONG));
> > +		if (ret == 0)
> > +			return -ETIMEDOUT;
> >  	} else {
> >  		/* Sleep for result ready time */
> >  		timeout = (opt->int_time == OPT3001_INT_TIME_SHORT) ?
> > @@ -312,9 +314,7 @@ static int opt3001_get_lux(struct opt3001 *opt, int *val, int *val2)
> >  		/* Disallow IRQ to access the device while lock is active */
> >  		opt->ok_to_ignore_lock = false;
> >  
> > -	if (ret == 0)
> > -		return -ETIMEDOUT;
> > -	else if (ret < 0)
> > +	if (ret < 0)
> >  		return ret;
> >  
> >  	if (opt->use_irq) {  
> 


      reply	other threads:[~2021-10-03 15:40 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-20 12:53 [PATCH] iio: light: opt3001: Fixed timeout error when 0 lux Jiri Valek - 2N
2021-09-26 13:55 ` Jonathan Cameron
2021-10-03 15:43   ` Jonathan Cameron [this message]

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=20211003164355.3757c44f@jic23-huawei \
    --to=jic23@kernel.org \
    --cc=dannenberg@ti.com \
    --cc=gwendal@chromium.org \
    --cc=lars@metafoo.de \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mail@alexanderkoch.net \
    --cc=valek@2n.cz \
    /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;
as well as URLs for NNTP newsgroup(s).