X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev-remove.c;h=27ff5bc0a2e12d38167ba1db43d85ca78ac3ccf0;hb=16ddbbe10a6484daf63596818a19890225388a71;hp=41636b684e265120897e4233658feb4120b3de22;hpb=7e371e86a420cb82948b72ca3dd93915cb8dd764;p=elogind.git

diff --git a/udev-remove.c b/udev-remove.c
index 41636b684..27ff5bc0a 100644
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -135,22 +135,26 @@ 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) {
+	if (retval != 0) {
 		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='%s'", dev.name);
 
-	dbg("name is '%s'", dev.name);
+	dev.type = get_device_type(path, subsystem);
+	dev_d_send(&dev, subsystem, path);
 	udevdb_delete_dev(path);
 
-	dev_d_send(&dev, subsystem);
+	if (dev.type == 'b' || dev.type == 'c')
+		retval = delete_node(&dev);
+	else if (dev.type == 'n')
+		retval = 0;
 
-	retval = delete_node(&dev);
 	return retval;
 }