chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] gentoo fb permission fix.
[elogind.git]
/
udev_sysfs.c
diff --git
a/udev_sysfs.c
b/udev_sysfs.c
index a25223ef461248242e394a7dc1b57fcdc366c36e..1b3603df6d0d018b815bf4488e58f3a2e3890811 100644
(file)
--- a/
udev_sysfs.c
+++ b/
udev_sysfs.c
@@
-31,7
+31,7
@@
#include "libsysfs/sysfs/libsysfs.h"
#include "udev_version.h"
#include "udev_sysfs.h"
#include "libsysfs/sysfs/libsysfs.h"
#include "udev_version.h"
#include "udev_sysfs.h"
-#include "udev_
lib
.h"
+#include "udev_
utils
.h"
#include "logging.h"
/* list of subsystem specific files, NULL if there is no file to wait for */
#include "logging.h"
/* list of subsystem specific files, NULL if there is no file to wait for */
@@
-39,6
+39,7
@@
static const struct subsystem_file {
const char *subsystem;
const char *file;
} subsystem_files[] = {
const char *subsystem;
const char *file;
} subsystem_files[] = {
+ { .subsystem = "class", .file = NULL },
{ .subsystem = "net", .file = "ifindex" },
{ .subsystem = "scsi_host", .file = "unique_id" },
{ .subsystem = "scsi_device", .file = NULL },
{ .subsystem = "net", .file = "ifindex" },
{ .subsystem = "scsi_host", .file = "unique_id" },
{ .subsystem = "scsi_device", .file = NULL },
@@
-51,6
+52,10
@@
static const struct subsystem_file {
{ .subsystem = "ieee1394", .file = NULL },
{ .subsystem = "ieee1394_host", .file = NULL },
{ .subsystem = "ieee1394_node", .file = NULL },
{ .subsystem = "ieee1394", .file = NULL },
{ .subsystem = "ieee1394_host", .file = NULL },
{ .subsystem = "ieee1394_node", .file = NULL },
+ { .subsystem = "fc_transport", .file = "port_id" },
+ { .subsystem = "fc_host", .file = "port_id" },
+ { .subsystem = "spi_transport", .file = "width" },
+ { .subsystem = "spi_host", .file = "width" },
{ NULL, NULL }
};
{ NULL, NULL }
};
@@
-170,9
+175,12
@@
static int class_device_expect_no_device_link(struct sysfs_class_device *class_d
{ .subsystem = "net", .device = "bnep" },
{ .subsystem = "net", .device = "vmnet" },
{ .subsystem = "net", .device = "ippp" },
{ .subsystem = "net", .device = "bnep" },
{ .subsystem = "net", .device = "vmnet" },
{ .subsystem = "net", .device = "ippp" },
+ { .subsystem = "net", .device = "nlv" },
+ { .subsystem = "net", .device = "atml" },
{ .subsystem = "ppp", .device = NULL },
{ .subsystem = "sound", .device = NULL },
{ .subsystem = "printer", .device = "lp" },
{ .subsystem = "ppp", .device = NULL },
{ .subsystem = "sound", .device = NULL },
{ .subsystem = "printer", .device = "lp" },
+ { .subsystem = "ppdev", .device = NULL },
{ .subsystem = "nvidia", .device = NULL },
{ .subsystem = "video4linux", .device = "vbi" },
{ .subsystem = "dvb", .device = NULL },
{ .subsystem = "nvidia", .device = NULL },
{ .subsystem = "video4linux", .device = "vbi" },
{ .subsystem = "dvb", .device = NULL },
@@
-274,11
+282,12
@@
int wait_for_devices_device(struct sysfs_device *devices_dev,
{ .bus = "ide", .file = "detach_state" },
{ .bus = "pci", .file = "vendor" },
{ .bus = "platform", .file = "detach_state" },
{ .bus = "ide", .file = "detach_state" },
{ .bus = "pci", .file = "vendor" },
{ .bus = "platform", .file = "detach_state" },
+ { .bus = "pcmcia", .file = "detach_state" },
{ .bus = "i2c", .file = "detach_state" },
{ .bus = "ieee1394", .file = "node_count" },
{ .bus = "ieee1394", .file = "nodeid" },
{ .bus = "ieee1394", .file = "address" },
{ .bus = "i2c", .file = "detach_state" },
{ .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" },
{ .bus = "pnp", .file = "detach_state" },
{ .bus = "eisa", .file = "detach_state" },
{ .bus = "pseudo", .file = "detach_state" },
@@
-338,6
+347,11
@@
int wait_for_devices_device(struct sysfs_device *devices_dev,
char filename[SYSFS_PATH_MAX];
struct stat stats;
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);
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);
@@
-367,7
+381,7
@@
int wait_for_devices_device(struct sysfs_device *devices_dev,
struct sysfs_class_device *wait_class_device_open(const char *path)
{
struct sysfs_class_device *wait_class_device_open(const char *path)
{
- struct sysfs_class_device *class_dev;
+ struct sysfs_class_device *class_dev
= NULL
;
int loop;
loop = WAIT_MAX_SECONDS * WAIT_LOOP_PER_SECOND;
int loop;
loop = WAIT_MAX_SECONDS * WAIT_LOOP_PER_SECOND;
@@
-379,7
+393,7
@@
struct sysfs_class_device *wait_class_device_open(const char *path)
usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
}
usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
}
- return
(class_dev)
;
+ return
class_dev
;
}
int wait_for_class_device(struct sysfs_class_device *class_dev,
}
int wait_for_class_device(struct sysfs_class_device *class_dev,
@@
-436,7
+450,7
@@
int wait_for_class_device(struct sysfs_class_device *class_dev,
struct sysfs_device *wait_devices_device_open(const char *path)
{
struct sysfs_device *wait_devices_device_open(const char *path)
{
- struct sysfs_device *devices_dev;
+ struct sysfs_device *devices_dev
= NULL
;
int loop;
loop = WAIT_MAX_SECONDS * WAIT_LOOP_PER_SECOND;
int loop;
loop = WAIT_MAX_SECONDS * WAIT_LOOP_PER_SECOND;
@@
-448,5
+462,5
@@
struct sysfs_device *wait_devices_device_open(const char *path)
usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
}
usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
}
- return
(devices_dev)
;
+ return
devices_dev
;
}
}