From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 14 Mar 2016 12:23:52 +0000 (-0400)
Subject: Merge pull request #2834 from coling/master
X-Git-Tag: v230~271
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51f2174037055da7d974b9f8739a98da7f493432;p=thirdparty%2Fsystemd.git

Merge pull request #2834 from coling/master
---

51f2174037055da7d974b9f8739a98da7f493432
diff --cc src/core/device.c
index d201dc5e4bb,c64e01c2aad..28e4039da20
--- a/src/core/device.c
+++ b/src/core/device.c
@@@ -318,7 -318,7 +318,7 @@@ static int device_setup_unit(Manager *m
           * the GC to have garbaged it. That's desired since the device
           * unit may have a dependency on the mount unit which was
           * added during the loading of the later. */
-         if (u && DEVICE(u)->state == DEVICE_PLUGGED) {
 -        if (sysfs && u && DEVICE(u)->state == DEVICE_PLUGGED) {
++        if (dev && u && DEVICE(u)->state == DEVICE_PLUGGED) {
                  /* This unit is in plugged state: we're sure it's
                   * attached to a device. */
                  if (!path_equal(DEVICE(u)->sysfs, sysfs)) {