Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 259645
b: refs/heads/master
c: ae19178
h: refs/heads/master
i:
  259643: 02aa4c8
v: v3
  • Loading branch information
Michael Hennerich authored and Greg Kroah-Hartman committed Jun 28, 2011
1 parent 3e12ccb commit 86128f9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 88bc30548aae18a39fd5d35cbb160a1ea347b4a7
refs/heads/master: ae19178eacfab141afdd886e002bb80c99dba63a
1 change: 1 addition & 0 deletions trunk/drivers/staging/iio/iio.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
enum iio_chan_type {
/* real channel types */
IIO_IN,
IIO_OUT,
IIO_CURRENT,
IIO_POWER,
IIO_ACCEL,
Expand Down
4 changes: 3 additions & 1 deletion trunk/drivers/staging/iio/industrialio-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ static const char * const iio_chan_type_name_spec_shared[] = {
[IIO_TIMESTAMP] = "timestamp",
[IIO_ACCEL] = "accel",
[IIO_IN] = "in",
[IIO_OUT] = "out",
[IIO_CURRENT] = "current",
[IIO_POWER] = "power",
[IIO_IN_DIFF] = "in-in",
Expand Down Expand Up @@ -675,7 +676,8 @@ static int iio_device_add_channel_sysfs(struct iio_dev *dev_info,
else
ret = __iio_add_chan_devattr("raw", NULL, chan,
&iio_read_channel_info,
NULL,
(chan->type == IIO_OUT ?
&iio_write_channel_info : NULL),
0,
0,
&dev_info->dev,
Expand Down

0 comments on commit 86128f9

Please sign in to comment.