From: Tom Gundersen <teg@jklm.no>
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: v221~217
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7283a80d10217b929acf58899f016ca06dacdc53;p=thirdparty%2Fsystemd.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/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
index af8137b1ae9..ddb7b93ae70 100644
--- a/src/libsystemd/sd-device/sd-device.c
+++ b/src/libsystemd/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;