[Linux-kernel-commits] [9330] trunk/drivers/staging/iio: merge from upstream: staging: iio: lis3l02dqbuffersimple.c bring example up to date.

[vapier]

Title: [9330] trunk/drivers/staging/iio: merge from upstream: staging: iio: lis3l02dqbuffersimple.c bring example up to date.

Revision

9330

Author

vapier

Date

2010-10-24 16:39:34 -0400 (Sun, 24 Oct 2010)

Log Message

merge from upstream: staging: iio: lis3l02dqbuffersimple.c bring example up to date.

From: Jonathan Cameron <ji...@cam.ac.uk>

Signed-off-by: Jonathan Cameron <ji...@cam.ac.uk>
Acked-by: Manuel Stahl <manuel.st...@iis.fraunhofer.de>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>

Modified Paths

• trunk/drivers/staging/iio/Documentation/lis3l02dqbuffersimple.c
• trunk/drivers/staging/iio/trigger.h

Diff

Modified: trunk/drivers/staging/iio/Documentation/lis3l02dqbuffersimple.c (9329 => 9330)

--- trunk/drivers/staging/iio/Documentation/lis3l02dqbuffersimple.c	2010-10-24 20:39:30 UTC (rev 9329)
+++ trunk/drivers/staging/iio/Documentation/lis3l02dqbuffersimple.c	2010-10-24 20:39:34 UTC (rev 9330)
@@ -130,7 +130,7 @@
 		goto error_free_buf_dir_name;
 
 	/* Enable the buffer */
-	ret = write_sysfs_int("ring_enable", buf_dir_name, 1);
+	ret = write_sysfs_int("enable", buf_dir_name, 1);
 	if (ret < 0)
 		goto error_free_buf_dir_name;
 
@@ -209,7 +209,7 @@
 	}
 
 	/* Stop the ring buffer */
-	ret = write_sysfs_int("ring_enable", buf_dir_name, 0);
+	ret = write_sysfs_int("enable", buf_dir_name, 0);
 	if (ret < 0)
 		goto error_close_buffer_event;
 

Modified: trunk/drivers/staging/iio/trigger.h (9329 => 9330)

--- trunk/drivers/staging/iio/trigger.h	2010-10-24 20:39:30 UTC (rev 9329)
+++ trunk/drivers/staging/iio/trigger.h	2010-10-24 20:39:34 UTC (rev 9330)
@@ -152,7 +152,7 @@
 
 /*
  * Two functions for common case where all that happens is a pollfunc
- * is attached and detached form a trigger
+ * is attached and detached from a trigger
  */
 int iio_triggered_ring_postenable(struct iio_dev *indio_dev);
 int iio_triggered_ring_predisable(struct iio_dev *indio_dev);

_______________________________________________
Linux-kernel-commits mailing list
Linux-kernel-commits@blackfin.uclinux.org
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits