[PATCH] add support for /devices-devices without any file to wait for

This commit is contained in:
kay.sievers@vrfy.org
2005-04-26 22:30:28 -07:00
committed by Greg KH
parent ff5761c972
commit 7a0643a93f
+7 -1
View File
@@ -267,6 +267,7 @@ int wait_for_devices_device(struct sysfs_device *devices_dev,
const char *file;
} device_files[] = {
{ .bus = "scsi", .file = "vendor" },
{ .bus = "usb", .file = NULL },
{ .bus = "usb", .file = "idVendor" },
{ .bus = "usb", .file = "iInterface" },
{ .bus = "usb", .file = "bNumEndpoints" },
@@ -278,7 +279,7 @@ int wait_for_devices_device(struct sysfs_device *devices_dev,
{ .bus = "ieee1394", .file = "node_count" },
{ .bus = "ieee1394", .file = "nodeid" },
{ .bus = "ieee1394", .file = "address" },
{ .bus = "bttv-sub", .file = "detach_state" },
{ .bus = "bttv-sub", .file = NULL },
{ .bus = "pnp", .file = "detach_state" },
{ .bus = "eisa", .file = "detach_state" },
{ .bus = "pseudo", .file = "detach_state" },
@@ -338,6 +339,11 @@ int wait_for_devices_device(struct sysfs_device *devices_dev,
char filename[SYSFS_PATH_MAX];
struct stat stats;
if (devicefile->file == NULL) {
dbg("bus '%s' has no file to wait for", devices_dev->bus);
return 0;
}
found_bus_type = 1;
snprintf(filename, SYSFS_PATH_MAX-1, "%s/%s", devices_dev->path, devicefile->file);
dbg("looking at bus '%s' device for specific file '%s'", devices_dev->bus, filename);