summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2013-03-18 15:22:32 +0100
committerIan Stakenvicius <axs@gentoo.org>2013-04-02 13:54:36 -0400
commit05b510b489995625b5c59ef973b32963dda8a0a6 (patch)
treea62132d101f19bd6188cbf442599e1c925aeef71 /src
parentf3ea87f611a02618a59c1e30989718da6ff31970 (diff)
udev: ifdef all firmware special handling
Signed-off-by: Anthony G. Basile <blueness@gentoo.org> Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
Diffstat (limited to 'src')
-rw-r--r--src/udev/udevd.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 9325ed58b0..fc9cc37b13 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -97,7 +97,9 @@ struct event {
dev_t devnum;
int ifindex;
bool is_block;
+#ifdef ENABLE_FIRMWARE
bool nodelay;
+#endif
};
static inline struct event *node_to_event(struct udev_list_node *node)
@@ -441,8 +443,10 @@ static int event_queue_insert(struct udev_device *dev)
event->devnum = udev_device_get_devnum(dev);
event->is_block = streq("block", udev_device_get_subsystem(dev));
event->ifindex = udev_device_get_ifindex(dev);
+#ifdef ENABLE_FIRMWARE
if (streq(udev_device_get_subsystem(dev), "firmware"))
event->nodelay = true;
+#endif
udev_queue_export_device_queued(udev_queue_export, dev);
log_debug("seq %llu queued, '%s' '%s'\n", udev_device_get_seqnum(dev),
@@ -522,9 +526,11 @@ static bool is_devpath_busy(struct event *event)
return true;
}
+#ifdef ENABLE_FIRMWARE
/* allow to bypass the dependency tracking */
if (event->nodelay)
continue;
+#endif
/* parent device event found */
if (event->devpath[common] == '/') {