X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=dev_d.c;h=5580b5a3627ea09ee59ed9acd47000cc0190d750;hb=7a947ce51586fd4212447643df90580542777ab9;hp=eaf9b1dc12c7ecef5364a373041f380f5d964d89;hpb=da767d0739c86a04a0c0326cebff6c08ffe1228c;p=elogind.git

diff --git a/dev_d.c b/dev_d.c
index eaf9b1dc1..5580b5a36 100644
--- a/dev_d.c
+++ b/dev_d.c
@@ -80,7 +80,7 @@ static int run_program(char *name)
  * 	subsystem/
  * 	default/
  */
-void dev_d_send(struct udevice *dev, const char *subsystem, const char *devpath)
+void dev_d_send(struct udevice *udev)
 {
 	char dirname[256];
 	char env_devname[NAME_SIZE];
@@ -91,17 +91,17 @@ void dev_d_send(struct udevice *dev, const char *subsystem, const char *devpath)
 		return;
 
 	memset(env_devname, 0x00, sizeof(env_devname));
-	if (dev->type == 'b' || dev->type == 'c') {
+	if (udev->type == 'b' || udev->type == 'c') {
 		strfieldcpy(env_devname, udev_root);
-		strfieldcat(env_devname, dev->name);
-	} else if (dev->type == 'n') {
-		strfieldcpy(env_devname, dev->name);
-		setenv("DEVPATH", devpath, 1);
+		strfieldcat(env_devname, udev->name);
+	} else if (udev->type == 'n') {
+		strfieldcpy(env_devname, udev->name);
+		setenv("DEVPATH", udev->devpath, 1);
 	}
 	setenv("DEVNAME", env_devname, 1);
 	dbg("DEVNAME='%s'", env_devname);
 
-	devname = strdup(dev->name);
+	devname = strdup(udev->name);
 	if (!devname) {
 		dbg("out of memory");
 		return;
@@ -121,11 +121,11 @@ void dev_d_send(struct udevice *dev, const char *subsystem, const char *devpath)
 	}
 
 	strcpy(dirname, DEVD_DIR);
-	strfieldcat(dirname, dev->name);
+	strfieldcat(dirname, udev->name);
 	call_foreach_file(run_program, dirname, DEVD_SUFFIX);
 
 	strcpy(dirname, DEVD_DIR);
-	strfieldcat(dirname, subsystem);
+	strfieldcat(dirname, udev->subsystem);
 	call_foreach_file(run_program, dirname, DEVD_SUFFIX);
 
 	strcpy(dirname, DEVD_DIR "default");