X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev-remove.c;h=666928f318fa7699062f75009f503179262a1ce0;hb=bf0314e326319354c857a7e9150460ec239fb07d;hp=430f1c901e316592f6ab7dc1af0eee196c1d7dad;hpb=a9ce0a410e7ef573f2f1f48ea793829d3cec389f;p=elogind.git

diff --git a/udev-remove.c b/udev-remove.c
index 430f1c901..666928f31 100644
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -40,15 +40,20 @@
  * something different from the kernel name.  If we have, us it.  If not, use
  * the default kernel name for lack of anything else to know to do.
  */
-static char *get_name(char *dev, int major, int minor)
+static char *get_name(char *path, int major, int minor)
 {
 	static char name[100];
+	struct udevice *dev;
 	char *temp;
 
-	if (udevdb_get_dev(dev, &name[0], sizeof(name)) == 0)
+	dev = udevdb_get_dev(path);
+	if (dev != NULL) {
+		strcpy(name, dev->name);
 		goto exit;
+	}
 
-	temp = strrchr(dev, '/');
+	dbg("%s not found in database, falling back on default name", path);
+	temp = strrchr(path, '/');
 	if (temp == NULL)
 		return NULL;
 	strncpy(name, &temp[1], sizeof(name));
@@ -65,7 +70,7 @@ static int delete_node(char *name)
 {
 	char filename[255];
 
-	strncpy(filename, UDEV_ROOT, sizeof(filename));
+	strncpy(filename, udev_root, sizeof(filename));
 	strncat(filename, name, sizeof(filename));
 
 	dbg("unlinking %s", filename);
@@ -84,7 +89,6 @@ int udev_remove_device(char *device, char *subsystem)
 		goto exit;
 	}
 
-	udevdb_delete_udevice(name);
 	udevdb_delete_dev(device);
 
 	return delete_node(name);