summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2015-08-24 18:37:02 +0200
committerTom Gundersen <teg@jklm.no>2015-08-24 18:37:02 +0200
commit53496ca9adc383bd8aa28e8f75f1b21c2cc82b05 (patch)
tree1165ef652af1c05405f06ad6c9385e6d5f21adcf
parent1105ea51a85dd72e0067045d4f50cbb2c69eefc4 (diff)
parent9a9c7dc2cbbe3c26cfbbcb02475d95ff3afe507e (diff)
Merge pull request #1012 from gentoo-root/master
sd-device: fix enumeration of devices without subsystem
-rw-r--r--src/libsystemd/sd-device/device-enumerator.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libsystemd/sd-device/device-enumerator.c b/src/libsystemd/sd-device/device-enumerator.c
index 7fd77e9480..5eb37e16cb 100644
--- a/src/libsystemd/sd-device/device-enumerator.c
+++ b/src/libsystemd/sd-device/device-enumerator.c
@@ -719,6 +719,8 @@ static int parent_add_child(sd_device_enumerator *enumerator, const char *path)
return r;
r = sd_device_get_subsystem(device, &subsystem);
+ if (r == -ENOENT)
+ return 0;
if (r < 0)
return r;