---

yaml --- r: 304331 b: refs/heads/master c: 8b1f522 h: refs/heads/master i: 304329: b310eb9 304327: b25c3a3 v: v3
git-mirror · Apr 10, 2012 · deb1532 · deb1532
1 parent f9e793e
commit deb1532
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)