X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevinfo.c;h=9ba302cbdc2c5e6afda8e0102822efe423a54a2c;hb=8a0dc204e902a47a5b251c6d4a29eddb8f4a634a;hp=097c91c21b9db82839786d9f1fdcfa371b759fd3;hpb=e4ad54a302773d8b1c197e32fe67541f1b60518e;p=elogind.git

diff --git a/udevinfo.c b/udevinfo.c
index 097c91c21..9ba302cbd 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -125,10 +125,6 @@ static int print_device_chain(const char *path)
 	struct sysfs_device *sysfs_dev;
 	struct sysfs_device *sysfs_dev_parent;
 	int retval = 0;
-	char type;
-
-	type = get_device_type(path, "");
-	dbg("device type is %c", type);
 
 	/*  get the class dev */
 	class_dev = sysfs_open_class_device_path(path);
@@ -144,16 +140,10 @@ static int print_device_chain(const char *path)
 	       "to match the device for which the node will be created.\n"
 	       "\n");
 
-	if (type == 'b' || type =='c') {
-		/* read the 'dev' file for major/minor*/
-		attr = sysfs_get_classdev_attr(class_dev, "dev");
-		if (attr == NULL) {
-			printf("couldn't get the \"dev\" file\n");
-			retval = -1;
-			goto exit;
-		}
+	/* look for the 'dev' file */
+	attr = sysfs_get_classdev_attr(class_dev, "dev");
+	if (attr != NULL)
 		printf("device '%s' has major:minor %s", class_dev->path, attr->value);
-	}
 
 	/* open sysfs class device directory and print all attributes */
 	printf("  looking at class device '%s':\n", class_dev->path);
@@ -411,7 +401,7 @@ print:
 			break;
 
 		case PATH:
-			strfieldcpy(result, path);
+			strfieldcpy(result, udev.devpath);
 			break;
 
 		case ALL: