From deb1532f6f444eee20dbfc9b2b0aa748fb8930cc Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Tue, 10 Apr 2012 21:11:08 +0100 Subject: [PATCH] --- yaml --- r: 304331 b: refs/heads/master c: 8b1f52278f544af608d576e8db2b79ed651a9414 h: refs/heads/master i: 304329: b310eb9552515a1aeda94a4bf4527293872b38da 304327: b25c3a314f8bc6e6211b1afacb5e3b95c0cb8bf8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/accel/lis3l02dq_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 72ddd426d8ad..1e87712af0ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b27d678c7fbeb88ab07b890b09c32a83121d9d6 +refs/heads/master: 8b1f52278f544af608d576e8db2b79ed651a9414 diff --git a/trunk/drivers/staging/iio/accel/lis3l02dq_core.c b/trunk/drivers/staging/iio/accel/lis3l02dq_core.c index 376da5137967..bcf47123dd6d 100644 --- a/trunk/drivers/staging/iio/accel/lis3l02dq_core.c +++ b/trunk/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)