From: Jonathan Cameron <jic23@cam.ac.uk>
Date: Fri, 12 Aug 2011 15:55:35 +0000 (+0100)
Subject: staging:iio: dummy sysfs group for autogenerated base directories.
X-Git-Tag: firefly_0821_release~3680^2~4313^2^2~864^2~252
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f7256877c777d08f3af445840d94e37b11038fe2;p=firefly-linux-kernel-4.4.55.git

staging:iio: dummy sysfs group for autogenerated base directories.

Needed to ensure the reference counting is correct.
Temporary fix whilst discussions are ongoing.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
index 7ee4186c4dfa..8bee56250a96 100644
--- a/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@ -725,19 +725,29 @@ static ssize_t iio_show_dev_name(struct device *dev,
 
 static DEVICE_ATTR(name, S_IRUGO, iio_show_dev_name, NULL);
 
+static struct attribute *iio_base_dummy_attrs[] = {
+	NULL
+};
+static struct attribute_group iio_base_dummy_group = {
+	.attrs = iio_base_dummy_attrs,
+};
+
 static int iio_device_register_sysfs(struct iio_dev *dev_info)
 {
 	int i, ret = 0;
 	struct iio_dev_attr *p, *n;
 
-	if (dev_info->info->attrs) {
+	if (dev_info->info->attrs)
 		ret = sysfs_create_group(&dev_info->dev.kobj,
 					 dev_info->info->attrs);
-		if (ret) {
-			dev_err(dev_info->dev.parent,
-				"Failed to register sysfs hooks\n");
-			goto error_ret;
-		}
+	else
+		ret = sysfs_create_group(&dev_info->dev.kobj,
+					 &iio_base_dummy_group);
+	
+	if (ret) {
+		dev_err(dev_info->dev.parent,
+			"Failed to register sysfs hooks\n");
+		goto error_ret;
 	}
 
 	/*
@@ -753,7 +763,7 @@ static int iio_device_register_sysfs(struct iio_dev *dev_info)
 			if (ret < 0)
 				goto error_clear_attrs;
 		}
-	if (dev_info->name) {
+	if (dev_info->name) { 
 		ret = sysfs_add_file_to_group(&dev_info->dev.kobj,
 					      &dev_attr_name.attr,
 					      NULL);
@@ -770,6 +780,8 @@ error_clear_attrs:
 	}
 	if (dev_info->info->attrs)
 		sysfs_remove_group(&dev_info->dev.kobj, dev_info->info->attrs);
+	else
+		sysfs_remove_group(&dev_info->dev.kobj, &iio_base_dummy_group);
 error_ret:
 	return ret;
 
@@ -790,6 +802,8 @@ static void iio_device_unregister_sysfs(struct iio_dev *dev_info)
 
 	if (dev_info->info->attrs)
 		sysfs_remove_group(&dev_info->dev.kobj, dev_info->info->attrs);
+	else
+		sysfs_remove_group(&dev_info->dev.kobj, &iio_base_dummy_group);
 }
 
 /* Return a negative errno on failure */