diff options
Diffstat (limited to 'src/libsystemd/sd-device')
| -rw-r--r-- | src/libsystemd/sd-device/device-enumerator.c | 2 | ||||
| -rw-r--r-- | src/libsystemd/sd-device/device-private.c | 8 |
2 files changed, 5 insertions, 5 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; diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c index 2e60433246..0ec9667744 100644 --- a/src/libsystemd/sd-device/device-private.c +++ b/src/libsystemd/sd-device/device-private.c @@ -1082,12 +1082,10 @@ int device_update_db(sd_device *device) { return 0; fail: - log_error_errno(r, "failed to create %s file '%s' for '%s'", has_info ? "db" : "empty", - path, device->devpath); - unlink(path); - unlink(path_tmp); + (void) unlink(path); + (void) unlink(path_tmp); - return r; + return log_error_errno(r, "failed to create %s file '%s' for '%s'", has_info ? "db" : "empty", path, device->devpath); } int device_delete_db(sd_device *device) { |