Merge gregkh@ehlo.org:/home/kay/public_html/pub/scm/linux/hotplug/udev-kay

1 files changed, 10 insertions, 16 deletions

diff --git a/udev_remove.c b/udev_remove.c
index 2df555327b..cf28ff37a9 100644
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -140,26 +140,20 @@ static int delete_node(struct udevice *udev)
  */
 int udev_remove_device(struct udevice *udev)
 {
-	const char *temp;
-
 	if (udev->type != DEV_BLOCK && udev->type != DEV_CLASS)
 		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 {
-		/* fall back to kernel name */
-		temp = strrchr(udev->devpath, '/');
-		if (temp == NULL)
-			return -ENODEV;
-		strlcpy(udev->name, &temp[1], sizeof(udev->name));
-		info("'%s' not found in database, falling back on default name", udev->name);
+	/* 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;
 	}
+	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);