X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev-remove.c;h=c5de6c823fc8d938a2eb35e55c4da22126b588ac;hb=df496acbee49c5974f9ed42a92cca4a119315643;hp=6d7e2ad22a9c6d8af3becb485709a05e8d1ab202;hpb=a56ef382869bb76ade6d26cd7e8adc983ca3f89e;p=elogind.git

diff --git a/udev-remove.c b/udev-remove.c
index 6d7e2ad22..c5de6c823 100644
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -118,30 +118,26 @@ static int delete_node(struct udevice *dev)
  */
 int udev_remove_device(char *path, char *subsystem)
 {
-	struct udevice *dev;
+	struct udevice dev;
 	char *temp;
 	int retval;
 
-	dev = malloc(sizeof(*dev));
-	if (dev == NULL)
-		return -ENOMEM;
-	memset(dev, 0, sizeof(*dev));
+	memset(&dev, 0, sizeof(dev));
 
-	retval = udevdb_get_dev(path, 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;
-		strncpy(dev->name, &temp[1], sizeof(dev->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(dev->name, path);
+	sysbus_send_remove(dev.name, path);
 
-	retval = delete_node(dev);
-	free(dev);
+	retval = delete_node(&dev);
 	return retval;
 }