X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=wait_for_sysfs.c;h=25a3fb4eef9bcf4279a5f07e5c4c4770ca2461ca;hp=6f396b96caf10ce6c7bf1a67035e2b90af579957;hb=396bb4c3d33dfd68c5817da5e03251fbd82e2713;hpb=d38c486a519b7ba2acb06d57e0335a4a09adc355

diff --git a/wait_for_sysfs.c b/wait_for_sysfs.c
index 6f396b96c..25a3fb4ee 100644
--- a/wait_for_sysfs.c
+++ b/wait_for_sysfs.c
@@ -60,9 +60,10 @@ static int wait_for_class_device_attributes(struct sysfs_class_device *class_dev
 		{ .subsystem = "net",		.file = "ifindex" },
 		{ .subsystem = "scsi_host",	.file = "unique_id" },
 		{ .subsystem = "scsi_device",	.file = NULL },
-		{ .subsystem = "pcmcia_socket",	.file = "card_type" },
+		{ .subsystem = "pcmcia_socket",	.file = NULL }, /* all files are unreadable in empty slot :( */
 		{ .subsystem = "usb_host",	.file = NULL },
 		{ .subsystem = "bluetooth",	.file = "address" },
+		{ .subsystem = "firmware",	.file = "data" },
 		{ .subsystem = "i2c-adapter",	.file = NULL },
 		{ .subsystem = "pci_bus",	.file = NULL },
 		{ .subsystem = "ieee1394",	.file = NULL },
@@ -144,6 +145,7 @@ static int class_device_expect_no_device_link(struct sysfs_class_device *class_d
 		{ .subsystem = "net",		.device = "lo" },
 		{ .subsystem = "net",		.device = "tap" },
 		{ .subsystem = "net",		.device = "ipsec" },
+		{ .subsystem = "net",		.device = "irda" },
 		{ .subsystem = "sound",		.device = NULL },
 		{ .subsystem = "printer",	.device = "lp" },
 		{ .subsystem = "nvidia",	.device = NULL },