[PATCH] don't init namedev on remove

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index d10badc8eaff1bedd93f7c83408fa233bddcf58e..1220e637e5ce1befce760ac9231dbf2e95814bae 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -140,19 +140,18 @@ static int udev_hotplug(void)
        sigaction(SIGINT, &act, NULL);
        sigaction(SIGTERM, &act, NULL);
 
-       /* initialize the naming deamon */
-       namedev_init();
-
-       if (strcmp(action, "add") == 0)
+       if (strcmp(action, "add") == 0) {
+               namedev_init();
                retval = udev_add_device(devpath, subsystem, 0);
-
-       else if (strcmp(action, "remove") == 0)
-               retval = udev_remove_device(devpath, subsystem);
-
-       else {
-               dbg("unknown action '%s'", action);
-               retval = -EINVAL;
+       } else {
+               if (strcmp(action, "remove") == 0) {
+                       retval = udev_remove_device(devpath, subsystem);
+               } else {
+                       dbg("unknown action '%s'", action);
+                       retval = -EINVAL;
+               }
        }
+
        udevdb_exit();
 
 exit_sysbus: