X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=800882eb1aa4b2d077bc7315d41a448e77c99e2b;hp=dc3f94fffe364deb241f8738f8d914d789c8f7cd;hb=dd64e26b0c88892b367f57c4c7a7484e35641c7c;hpb=b608ade8e4b3df1f2e798dd460ce8ff4e70eb3d9 diff --git a/udevinfo.c b/udevinfo.c index dc3f94fff..800882eb1 100644 --- a/udevinfo.c +++ b/udevinfo.c @@ -161,7 +161,6 @@ static int print_device_chain(const char *path) "to match the device for which the node will be created.\n" "\n"); printf("device '%s' has major:minor %s", class_dev->path, attr->value); - sysfs_close_attribute(attr); /* open sysfs class device directory and print all attributes */ printf(" looking at class device '%s':\n", class_dev->path); @@ -173,11 +172,11 @@ static int print_device_chain(const char *path) /* get the device link (if parent exists look here) */ class_dev_parent = sysfs_get_classdev_parent(class_dev); - if (class_dev_parent != NULL) { - //sysfs_close_class_device(class_dev); - class_dev = class_dev_parent; - } - sysfs_dev = sysfs_get_classdev_device(class_dev); + if (class_dev_parent != NULL) + sysfs_dev = sysfs_get_classdev_device(class_dev_parent); + else + sysfs_dev = sysfs_get_classdev_device(class_dev); + if (sysfs_dev != NULL) printf("follow the class device's \"device\"\n"); @@ -194,13 +193,11 @@ static int print_device_chain(const char *path) if (sysfs_dev_parent == NULL) break; - //sysfs_close_device(sysfs_dev); sysfs_dev = sysfs_dev_parent; } - sysfs_close_device(sysfs_dev); exit: - //sysfs_close_class_device(class_dev); + sysfs_close_class_device(class_dev); return retval; }