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=9ee4e6ece34a248025f29e67e3225147d4bb7891;hp=ce1eb0b9fb84426893ea9263db40722accb5d33e;hb=61ee8cc92d5298da4fd4f46016991369a933ef7f;hpb=62a7b2d5a5dc731984e342ce249e25ffd1b738a6

diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c
index ce1eb0b9f..9ee4e6ece 100644
--- a/extras/usb_id/usb_id.c
+++ b/extras/usb_id/usb_id.c
@@ -54,29 +54,40 @@ static void set_usb_iftype(char *to, int if_class_num, size_t len)
 	case 1:
 		type = "audio";
 		break;
+	case 2: /* CDC-Control */
+		break;
 	case 3:
 		type = "hid";
 		break;
+	case 5: /* Physical */
+		break;
+	case 6:
+		type = "image";
+		break;
 	case 7:
 		type = "printer";
 		break;
 	case 8:
 		type = "storage";
 		break;
-	case 2: /* CDC-Control */
-	case 5: /* Physical */
-	case 6: /* Image */
-	case 9: /* HUB */
+	case 9:
+		type = "hub";
+		break;
 	case 0x0a: /* CDC-Data */
+		break;
 	case 0x0b: /* Chip/Smart Card */
+		break;
 	case 0x0d: /* Content Security */
 		break;
 	case 0x0e:
 		type = "video";
 		break;
 	case 0xdc: /* Diagnostic Device */
+		break;
 	case 0xe0: /* Wireless Controller */
-	case 0xf2: /* Application-specific */
+		break;
+	case 0xfe: /* Application-specific */
+		break;
 	case 0xff: /* Vendor-specific */
 		break;
 	default:
@@ -181,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(dev, "usb");
+	dev_interface = udev_device_get_parent_with_subsystem_devtype(dev, "usb", NULL);
 	if (dev_interface == NULL) {
 		info(udev, "unable to access usb_interface device of '%s'\n",
 		     udev_device_get_syspath(dev));
@@ -207,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(dev_interface, "usb");
+	dev_usb = udev_device_get_parent_with_subsystem_devtype(dev_interface, "usb", NULL);
 	if (!dev_usb) {
 		info(udev, "unable to find parent 'usb' device of '%s'\n",
 		     udev_device_get_syspath(dev));
@@ -221,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(dev, "scsi");
+		dev_scsi = udev_device_get_parent_with_subsystem_devtype(dev, "scsi", NULL);
 		if (dev_scsi == NULL) {
 			info(udev, "unable to find parent 'scsi' device of '%s'\n",
 			     udev_device_get_syspath(dev));