summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgreg@kroah.com <greg@kroah.com>2003-07-23 23:37:27 -0400
committerGreg KH <gregkh@suse.de>2005-04-26 21:01:40 -0700
commit8a6fbab6dd2ae52f4bf7edc25077948cc5f15a7d (patch)
treecf361a69c8c2496811313a827f8137ee0bca1bbf
parent20051a5be96f731291705d6dce5bf3de7567d6a3 (diff)
[PATCH] add NUMBER support (basically same logic as TOPOLOGY, perhaps we should merge this...)
-rw-r--r--namedev.c32
1 files changed, 29 insertions, 3 deletions
diff --git a/namedev.c b/namedev.c
index b0f1f281b1..d5f83c5bc2 100644
--- a/namedev.c
+++ b/namedev.c
@@ -433,11 +433,37 @@ static int get_attr(struct sysfs_class_device *class_dev, struct device_attr *at
dev->attr.owner, dev->attr.group, dev->attr.mode);
break;
case NUMBER:
- dbg("NUMBER name = '%s', bus = '%s', id = '%s'"
- " owner = '%s', group = '%s', mode = '%#o'",
- dev->attr.name, dev->bus, dev->id,
+ {
+ char path[SYSFS_PATH_MAX];
+ char *temp;
+
+ found = 0;
+ strcpy(path, class_dev->sysdevice->directory->path);
+ temp = strrchr(path, '/');
+ dbg("NUMBER path = '%s'", path);
+ dbg("NUMBER temp = '%s' id = '%s'", temp, dev->id);
+ if (strstr(temp, dev->id) != NULL) {
+ found = 1;
+ } else {
+ *temp = 0x00;
+ temp = strrchr(path, '/');
+ dbg("TOPOLOGY temp = '%s' id = '%s'", temp, dev->id);
+ if (strstr(temp, dev->id) != NULL)
+ found = 1;
+ }
+ if (!found)
+ continue;
+
+ strcpy(attr->name, dev->attr.name);
+ attr->mode = dev->attr.mode;
+ strcpy(attr->owner, dev->attr.owner);
+ strcpy(attr->group, dev->attr.group);
+ dbg("device id '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+ dev->id, attr->name,
dev->attr.owner, dev->attr.group, dev->attr.mode);
+ return retval;
break;
+ }
case TOPOLOGY:
{
char path[SYSFS_PATH_MAX];