X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_sysfs.c;h=fc7ee885b0b91fd08d208955f369991d489a33f4;hp=94c0164dec4ba54d725f066203e5e59ffc34d698;hb=915a12adc2ea28dc2391788c66b829caefefcfb4;hpb=9f6f8859b0d17b4df2b739b0b0096f62b34de87a

diff --git a/udev_sysfs.c b/udev_sysfs.c
index 94c0164de..fc7ee885b 100644
--- a/udev_sysfs.c
+++ b/udev_sysfs.c
@@ -172,6 +172,7 @@ static int class_device_expect_no_device_link(struct sysfs_class_device *class_d
 		{ .subsystem = "input",		.device = "mice" },
 		{ .subsystem = "input",		.device = "mouse" },
 		{ .subsystem = "input",		.device = "ts" },
+		{ .subsystem = "input",		.device = "js" },
 		{ .subsystem = "vc",		.device = NULL },
 		{ .subsystem = "tty",		.device = NULL },
 		{ .subsystem = "cpuid",		.device = "cpu" },
@@ -329,7 +330,7 @@ int wait_for_devices_device(struct sysfs_device *devices_dev,
 		{ .bus = "iucv",	.file = "detach_state" },
 		{ NULL, NULL }
 	};
-	const struct device_file *devicefile;
+	const struct device_file *devicefile = NULL;
 	int loop;
 
 	/* the kernel may tell us what to wait for */