From e8a6067368f20662d4f49c64d5744a013a8a01c2 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Wed, 26 Oct 2011 17:27:42 +0100 Subject: [PATCH] --- yaml --- r: 280995 b: refs/heads/master c: 0403e0d643809f1608448ada38a1877f26b7bf5d h: refs/heads/master i: 280993: b0daf8c1edda721bbd3079986d22192478389b90 280991: dcc3b861fcf7b412bee342263b0e20c0deee0752 v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/industrialio-core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ad120c6a07c6..33831b50a734 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5dd72ecb0166498852705939163f375d693d37f3 +refs/heads/master: 0403e0d643809f1608448ada38a1877f26b7bf5d diff --git a/trunk/drivers/staging/iio/industrialio-core.c b/trunk/drivers/staging/iio/industrialio-core.c index 26564094e33b..fbf24bdc56d9 100644 --- a/trunk/drivers/staging/iio/industrialio-core.c +++ b/trunk/drivers/staging/iio/industrialio-core.c @@ -416,7 +416,7 @@ int __iio_device_attr_init(struct device_attribute *dev_attr, sysfs_attr_init(&dev_attr->attr); /* Build up postfix of __postfix */ - if (chan->modified) { + if (chan->modified && !generic) { if (chan->extend_name) full_postfix = kasprintf(GFP_KERNEL, "%s_%s_%s", iio_modifier_names[chan