X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_remove.c;h=28885d4710faa15df1dd70f66c440408990b95a6;hp=cf28ff37a9bfb56044e9feb625af239ef2f74582;hb=d47fd445bd9ade720776f661a4ad7c4b2202d6f0;hpb=972d318a3123b00d0ed6b78bbcf70a0965841a8e

diff --git a/udev_remove.c b/udev_remove.c
index cf28ff37a..28885d471 100644
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -1,10 +1,8 @@
 /*
  * udev-remove.c
  *
- * Userspace devfs
- *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
@@ -143,18 +141,17 @@ int udev_remove_device(struct udevice *udev)
 	if (udev->type != DEV_BLOCK && udev->type != DEV_CLASS)
 		return 0;
 
-	/* remove node only if we can find it in our database */
-	if (udev_db_get_device(udev, udev->devpath) != 0) {
-		dbg("'%s' not found in database, ignore event", udev->name);
-		return -1;
-	}
-	if (udev->ignore_remove) {
-		dbg("remove event for '%s' requested to be ignored by rule", udev->name);
-		return 0;
+	if (udev_db_get_device(udev, udev->devpath) == 0) {
+		if (udev->ignore_remove) {
+			dbg("remove event for '%s' requested to be ignored by rule", udev->name);
+			return 0;
+		}
+		dbg("remove name='%s'", udev->name);
+		udev_db_delete_device(udev);
+	} else {
+		dbg("'%s' not found in database, using kernel name '%s'", udev->devpath, udev->kernel_name);
+		strlcpy(udev->name, udev->kernel_name, sizeof(udev->name));
 	}
-	dbg("remove name='%s'", udev->name);
-	udev_db_delete_device(udev);
-
 	/* use full path to the environment */
 	snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
 	udev->devname[sizeof(udev->devname)-1] = '\0';