X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fusb_id%2Fusb_id.c;h=0565e6403f2fd358844a33d2ebd228a10660c9c1;hp=9ee4e6ece34a248025f29e67e3225147d4bb7891;hb=fdcd1f4666a4cceb0de7935a72567f30f1905c08;hpb=61ee8cc92d5298da4fd4f46016991369a933ef7f

diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c
index 9ee4e6ece..0565e6403 100644
--- a/extras/usb_id/usb_id.c
+++ b/extras/usb_id/usb_id.c
@@ -62,7 +62,7 @@ static void set_usb_iftype(char *to, int if_class_num, size_t len)
 	case 5: /* Physical */
 		break;
 	case 6:
-		type = "image";
+		type = "media";
 		break;
 	case 7:
 		type = "printer";
@@ -192,7 +192,7 @@ static int usb_id(struct udev_device *dev)
 	dbg(udev, "syspath %s\n", udev_device_get_syspath(dev));
 
 	/* usb interface directory */
-	dev_interface = udev_device_get_parent_with_subsystem_devtype(dev, "usb", NULL);
+	dev_interface = udev_device_get_parent_with_subsystem_devtype(dev, "usb", "usb_interface");
 	if (dev_interface == NULL) {
 		info(udev, "unable to access usb_interface device of '%s'\n",
 		     udev_device_get_syspath(dev));
@@ -218,7 +218,7 @@ static int usb_id(struct udev_device *dev)
 	     udev_device_get_syspath(dev_interface), if_class_num, protocol);
 
 	/* usb device directory */
-	dev_usb = udev_device_get_parent_with_subsystem_devtype(dev_interface, "usb", NULL);
+	dev_usb = udev_device_get_parent_with_subsystem_devtype(dev_interface, "usb", "usb_device");
 	if (!dev_usb) {
 		info(udev, "unable to find parent 'usb' device of '%s'\n",
 		     udev_device_get_syspath(dev));
@@ -232,7 +232,7 @@ static int usb_id(struct udev_device *dev)
 		int host, bus, target, lun;
 
 		/* get scsi device */
-		dev_scsi = udev_device_get_parent_with_subsystem_devtype(dev, "scsi", NULL);
+		dev_scsi = udev_device_get_parent_with_subsystem_devtype(dev, "scsi", "scsi_device");
 		if (dev_scsi == NULL) {
 			info(udev, "unable to find parent 'scsi' device of '%s'\n",
 			     udev_device_get_syspath(dev));
@@ -395,7 +395,7 @@ int main(int argc, char **argv)
 			printf("Usage: usb_id [--usb-info] [--num-info] [--export] [--help] <devpath>\n"
 			       "  --usb-info  use usb strings instead\n"
 			       "  --num-info  use numerical values\n"
-			       "  --export    print values as environemt keys\n"
+			       "  --export    print values as environment keys\n"
 			       "  --help      print this help text\n\n");
 		default:
 			retval = 1;