X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev-remove.c;h=c5de6c823fc8d938a2eb35e55c4da22126b588ac;hb=542bd1c0150453c94f3cc179e3aa891581a5004a;hp=0886c23343e0a7ee98fe8539cd130ff6783034ed;hpb=4763256c65859b94ac7a309cbb8f772d5426a08d;p=elogind.git

diff --git a/udev-remove.c b/udev-remove.c
index 0886c2334..c5de6c823 100644
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -118,23 +118,26 @@ static int delete_node(struct udevice *dev)
  */
 int udev_remove_device(char *path, char *subsystem)
 {
-	char name[100];
-	struct udevice *dev;
+	struct udevice dev;
 	char *temp;
+	int retval;
+
+	memset(&dev, 0, sizeof(dev));
 
-	dev = udevdb_get_dev(path);
-	if (dev == NULL) {
+	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;
-		strncpy(name, &temp[1], sizeof(name));
+		strncpy(dev.name, &temp[1], sizeof(dev.name));
 	}
 
-	dbg("name is '%s'", dev->name);
+	dbg("name is '%s'", dev.name);
 	udevdb_delete_dev(path);
 
-	sysbus_send_remove(name, path);
+	sysbus_send_remove(dev.name, path);
 
-	return delete_node(dev);
+	retval = delete_node(&dev);
+	return retval;
 }