X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_device.c;h=5db27093d4316d6d6a9cce6668499d6e1064080d;hb=36af2ddcb92c51acad0f909bb5dfb090cea9c5ed;hp=781787ef4ac5149e404842aa7b6830695a72b789;hpb=f61f78a76e424e4ec8197bc52e08d19b2ce07236;p=elogind.git

diff --git a/udev_device.c b/udev_device.c
index 781787ef4..5db27093d 100644
--- a/udev_device.c
+++ b/udev_device.c
@@ -88,14 +88,14 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 		udev_rules_get_name(rules, udev);
 		if (udev->ignore_device) {
 			info("device event will be ignored");
-			return -1;
+			return 0;
 		}
 		/* create node, store in db */
 		if (udev->name[0] != '\0')
 			retval = udev_add_device(udev);
 		else
 			info("device node creation supressed");
-		return 0;
+		return retval;
 	}
 
 	if (major(udev->devt) != 0 && strcmp(udev->action, "remove") == 0) {
@@ -104,7 +104,7 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 		udev_rules_get_run(rules, udev);
 		if (udev->ignore_device) {
 			info("device event will be ignored");
-			return -1;
+			return 0;
 		}
 		/* get data from db, remove db-entry, delete node */
 		retval = udev_remove_device(udev);
@@ -112,15 +112,13 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 		/* restore stored persistent data */
 		list_for_each_entry(name_loop, &udev->env_list, node)
 			putenv(name_loop->name);
-		return 0;
+		return retval;
 	}
 
-	/* default devices */
+	/* default devices without a node */
 	udev_rules_get_run(rules, udev);
-	if (udev->ignore_device) {
+	if (udev->ignore_device)
 		info("device event will be ignored");
-		return -1;
-	}
 
 	return retval;
 }