summaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-02-14 14:19:00 +0000
committerJonathan Cameron <jic23@kernel.org>2014-02-18 10:26:55 +0000
commit77bfa8baa0c230eb3d8acccd7d341f406a32cdf4 (patch)
treef65b36b7eb57a06b40c83c9bb8b9e5069c48be10 /drivers/iio
parent92825ff97411f0121166485798cdaf2deb6b5952 (diff)
downloadlinux-stable-77bfa8baa0c230eb3d8acccd7d341f406a32cdf4.tar.gz
linux-stable-77bfa8baa0c230eb3d8acccd7d341f406a32cdf4.tar.bz2
linux-stable-77bfa8baa0c230eb3d8acccd7d341f406a32cdf4.zip
iio: Don't include extended name in shared attributes
The extended name is channel specific and should not be included in shared attributes. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/industrialio-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index a85b66081fae..39fb8cc46373 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -558,7 +558,7 @@ int __iio_device_attr_init(struct device_attribute *dev_attr,
->channel2],
postfix);
} else {
- if (chan->extend_name == NULL)
+ if (chan->extend_name == NULL || shared_by != IIO_SEPARATE)
full_postfix = kstrdup(postfix, GFP_KERNEL);
else
full_postfix = kasprintf(GFP_KERNEL,