[PATCH] kill stupid gcc4 warning

[elogind.git] / udev_sysfs.c

diff --git a/udev_sysfs.c b/udev_sysfs.c
index f0666509eaca5b87614d4124eb5a5e0d014ff4c5..fc7ee885b0b91fd08d208955f369991d489a33f4 100644 (file)
--- 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" },
@@ -307,6 +308,7 @@ int wait_for_devices_device(struct sysfs_device *devices_dev,
                { .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" },
@@ -328,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 */