X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev-remove.c;h=98c45d6c333650ff4ebb381ad6508e49568cad7b;hb=e5a2989efbae81f40b60885a8f92ea1f87df7ea9;hp=41636b684e265120897e4233658feb4120b3de22;hpb=7e371e86a420cb82948b72ca3dd93915cb8dd764;p=elogind.git

diff --git a/udev-remove.c b/udev-remove.c
index 41636b684..98c45d6c3 100644
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -135,22 +135,38 @@ int udev_remove_device(char *path, char *subsystem)
 	char *temp;
 	int retval;
 
-	memset(&dev, 0, sizeof(dev));
+	memset(&dev, 0x00, sizeof(dev));
 
-	retval = udevdb_get_dev(path, &dev);
-	if (retval) {
-		dbg("'%s' not found in database, falling back on default name", path);
-		temp = strrchr(path, '/');
-		if (temp == NULL)
-			return -ENODEV;
-		strfieldcpy(dev.name, &temp[1]);
-	}
+	dev.type = get_device_type(path, subsystem);
+
+	switch (dev.type) {
+	case 'b':
+	case 'c':
+		retval = udevdb_get_dev(path, &dev);
+		if (retval) {
+			dbg("'%s' not found in database, falling back on default name", path);
+			temp = strrchr(path, '/');
+			if (temp == NULL)
+				return -ENODEV;
+			strfieldcpy(dev.name, &temp[1]);
+		}
 
-	dbg("name is '%s'", dev.name);
-	udevdb_delete_dev(path);
+		dbg("name='%s'", dev.name);
+		udevdb_delete_dev(path);
 
-	dev_d_send(&dev, subsystem);
+		dev_d_send(&dev, subsystem);
+
+		retval = delete_node(&dev);
+		break;
+
+	case 'n':
+		retval = 0;
+		break;
+
+	default:
+		dbg("unknown device type '%c'", dev.type);
+		retval = -EINVAL;
+	}
 
-	retval = delete_node(&dev);
 	return retval;
 }