X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_sysfs.c;h=90ce48caeafe4abdf34e998e95adfcdbdaba9f3d;hp=f9ff1ed2f99c29f33905996b5e7f302991f45ee0;hb=cf7cad9dc90c15ac13baeae85db5e0e25b59ed0e;hpb=63f61c5cf639953aa38e025485919b0aa1c49b59

diff --git a/udev_sysfs.c b/udev_sysfs.c
index f9ff1ed2f..90ce48cae 100644
--- a/udev_sysfs.c
+++ b/udev_sysfs.c
@@ -297,38 +297,38 @@ int wait_for_devices_device(struct sysfs_device *devices_dev,
 		{ .bus = "usb",		.file = "idVendor" },
 		{ .bus = "usb",		.file = "iInterface" },
 		{ .bus = "usb",		.file = "bNumEndpoints" },
-		{ .bus = "usb-serial",	.file = "detach_state" },
-		{ .bus = "ide",		.file = "detach_state" },
+		{ .bus = "usb-serial",	.file = "bus" },
+		{ .bus = "ide",		.file = "bus" },
 		{ .bus = "pci",		.file = "vendor" },
-		{ .bus = "platform",	.file = "detach_state" },
-		{ .bus = "pcmcia",	.file = "detach_state" },
-		{ .bus = "i2c",		.file = "detach_state" },
+		{ .bus = "platform",	.file = "bus" },
+		{ .bus = "pcmcia",	.file = "bus" },
+		{ .bus = "i2c",		.file = "bus" },
 		{ .bus = "ieee1394",	.file = "node_count" },
 		{ .bus = "ieee1394",	.file = "nodeid" },
 		{ .bus = "ieee1394",	.file = "address" },
 		{ .bus = "bttv-sub",	.file = NULL },
-		{ .bus = "pnp",		.file = "detach_state" },
-		{ .bus = "eisa",	.file = "detach_state" },
-		{ .bus = "serio",	.file = "detach_state" },
-		{ .bus = "pseudo",	.file = "detach_state" },
-		{ .bus = "mmc",		.file = "detach_state" },
-		{ .bus = "macio",	.file = "detach_state" },
-		{ .bus = "of_platform",	.file = "detach_state" },
-		{ .bus = "vio",		.file = "detach_state" },
-		{ .bus = "ecard",	.file = "detach_state" },
-		{ .bus = "sa1111-rab",	.file = "detach_state" },
-		{ .bus = "amba",	.file = "detach_state" },
-		{ .bus = "locomo-bus",	.file = "detach_state" },
-		{ .bus = "logicmodule",	.file = "detach_state" },
-		{ .bus = "parisc",	.file = "detach_state" },
-		{ .bus = "ocp",		.file = "detach_state" },
-		{ .bus = "dio",		.file = "detach_state" },
-		{ .bus = "MCA",		.file = "detach_state" },
-		{ .bus = "wl",		.file = "detach_state" },
-		{ .bus = "ccwgroup",	.file = "detach_state" },
-		{ .bus = "css",		.file = "detach_state" },
-		{ .bus = "ccw",		.file = "detach_state" },
-		{ .bus = "iucv",	.file = "detach_state" },
+		{ .bus = "pnp",		.file = "bus" },
+		{ .bus = "eisa",	.file = "bus" },
+		{ .bus = "serio",	.file = "bus" },
+		{ .bus = "pseudo",	.file = "bus" },
+		{ .bus = "mmc",		.file = "bus" },
+		{ .bus = "macio",	.file = "bus" },
+		{ .bus = "of_platform",	.file = "bus" },
+		{ .bus = "vio",		.file = "bus" },
+		{ .bus = "ecard",	.file = "bus" },
+		{ .bus = "sa1111-rab",	.file = "bus" },
+		{ .bus = "amba",	.file = "bus" },
+		{ .bus = "locomo-bus",	.file = "bus" },
+		{ .bus = "logicmodule",	.file = "bus" },
+		{ .bus = "parisc",	.file = "bus" },
+		{ .bus = "ocp",		.file = "bus" },
+		{ .bus = "dio",		.file = "bus" },
+		{ .bus = "MCA",		.file = "bus" },
+		{ .bus = "wl",		.file = "bus" },
+		{ .bus = "ccwgroup",	.file = "bus" },
+		{ .bus = "css",		.file = "bus" },
+		{ .bus = "ccw",		.file = "bus" },
+		{ .bus = "iucv",	.file = "bus" },
 		{ NULL, NULL }
 	};
 	const struct device_file *devicefile = NULL;