staging:iio:accel:lis3l02dq add symmetry to check for presence of trigger.
authorJonathan Cameron <jic23@kernel.org>
Tue, 10 Apr 2012 20:11:08 +0000 (21:11 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 10 Apr 2012 20:26:33 +0000 (13:26 -0700)
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/iio/accel/lis3l02dq_core.c

index 376da51..bcf4712 100644 (file)
@@ -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)