From: Jonathan Cameron <jic23@kernel.org>
To: greg@kroah.com
Cc: linux-iio@vger.kernel.org, Jonathan Cameron <jic23@kernel.org>
Subject: [PATCH 5/6] staging:iio:accel:lis3l02dq add symmetry to check for presence of trigger.
Date: Tue, 10 Apr 2012 21:11:08 +0100 [thread overview]
Message-ID: <1334088669-21032-6-git-send-email-jic23@kernel.org> (raw)
In-Reply-To: <1334088669-21032-1-git-send-email-jic23@kernel.org>
Checking indio_dev->modes is uggly and not symmetric with the conditions
on whether triggers are allowed in the first place.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/staging/iio/accel/lis3l02dq_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c
index 376da51..bcf4712 100644
--- a/drivers/staging/iio/accel/lis3l02dq_core.c
+++ b/drivers/staging/iio/accel/lis3l02dq_core.c
@@ -724,7 +724,7 @@ static int __devinit lis3l02dq_probe(struct spi_device *spi)
return 0;
error_remove_trigger:
- if (indio_dev->modes & INDIO_BUFFER_TRIGGERED)
+ if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)))
lis3l02dq_remove_trigger(indio_dev);
error_free_interrupt:
if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
--
1.7.9.4
next prev parent reply other threads:[~2012-04-10 20:11 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-10 20:11 [PATCH 0/6] IIO: Mixed trivial fixes and cleanups Jonathan Cameron
2012-04-10 20:11 ` [PATCH 1/6] staging:iio:buffer example fix typos Jonathan Cameron
2012-04-10 20:11 ` [PATCH 2/6] staging:iio:adc:max1363 fix missing update_scan_mask callback Jonathan Cameron
2012-04-10 20:11 ` [PATCH 3/6] staging:iio fill in some missing docs Jonathan Cameron
2012-04-10 20:11 ` [PATCH 4/6] staging:iio:max1363 enable use with inkernel interfaces Jonathan Cameron
2012-04-10 20:11 ` Jonathan Cameron [this message]
2012-04-10 20:11 ` [PATCH 6/6] staging:iio: use spi->irq valid rather than querying available modes Jonathan Cameron
2012-04-10 20:27 ` [PATCH 0/6] IIO: Mixed trivial fixes and cleanups Greg KH
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=1334088669-21032-6-git-send-email-jic23@kernel.org \
--to=jic23@kernel.org \
--cc=greg@kroah.com \
--cc=linux-iio@vger.kernel.org \
/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).