From: Tom Gundersen Date: Mon, 1 Jun 2015 21:53:37 +0000 (+0200) Subject: sd-device: get_driver - remember if a device does not have a driver X-Git-Tag: v226.4~1^2~330 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=165d7d44bd29a34a0bc598314884e3204d8f753d;p=elogind.git sd-device: get_driver - remember if a device does not have a driver Don't try to read it again. --- diff --git a/src/libelogind/sd-device/sd-device.c b/src/libelogind/sd-device/sd-device.c index af8137b1a..ddb7b93ae 100644 --- a/src/libelogind/sd-device/sd-device.c +++ b/src/libelogind/sd-device/sd-device.c @@ -901,8 +901,11 @@ _public_ int sd_device_get_driver(sd_device *device, const char **ret) { if (r >= 0) { r = device_set_driver(device, driver); if (r < 0) - return r; - } + return log_debug_errno(r, "sd-device: could not set driver for %s: %m", device->devpath); + } else if (r == -ENOENT) + device->driver_set = true; + else + return log_debug_errno(r, "sd-device: could not set driver for %s: %m", device->devpath); } *ret = device->driver;