picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[PATCH] fix bug where NUMBER and TOPOLOGY would not work for partitions.

Browse source
This commit is contained in:
greg@kroah.com 2003-11-12 17:56:26 -08:00 committed by Greg KH
parent 7bd22a78a1
commit 8a0c11d360
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
namedev.c
View file

@ -608,6 +608,7 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
udev->mode = 0; udev->mode = 0;
/* find the sysfs_device for this class device */ /* find the sysfs_device for this class device */
/* Wouldn't it really be nice if libsysfs could do this for us? */
if (class_dev->sysdevice) { if (class_dev->sysdevice) {
sysfs_device = class_dev->sysdevice; sysfs_device = class_dev->sysdevice;
} else { } else {
@ -691,12 +692,11 @@ label_found:
case NUMBER: case NUMBER:
{ {
char path[SYSFS_PATH_MAX]; char path[SYSFS_PATH_MAX];
char *temp;
found = 0; found = 0;
if (!class_dev->sysdevice) if (!sysfs_device)
continue; continue;
strcpy(path, class_dev->sysdevice->path); strcpy(path, sysfs_device->path);
temp = strrchr(path, '/'); temp = strrchr(path, '/');
dbg_parse("NUMBER path = '%s'", path); dbg_parse("NUMBER path = '%s'", path);
dbg_parse("NUMBER temp = '%s' id = '%s'", temp, dev->id); dbg_parse("NUMBER temp = '%s' id = '%s'", temp, dev->id);
@ -727,12 +727,11 @@ label_found:
case TOPOLOGY: case TOPOLOGY:
{ {
char path[SYSFS_PATH_MAX]; char path[SYSFS_PATH_MAX];
char *temp;
if (!class_dev->sysdevice) if (!sysfs_device)
continue; continue;
found = 0; found = 0;
strcpy(path, class_dev->sysdevice->path); strcpy(path, sysfs_device->path);
temp = strrchr(path, '/'); temp = strrchr(path, '/');
dbg_parse("TOPOLOGY path = '%s'", path); dbg_parse("TOPOLOGY path = '%s'", path);
dbg_parse("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place); dbg_parse("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);