From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 27 Jun 2019 18:18:22 +0000 (+0900)
Subject: udevadm: ensure 'udevadm info -w' show updated result
X-Git-Tag: v243-rc1~151
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a555216df6e22c0d7b2b2d855b79e3e292f8c32;p=thirdparty%2Fsystemd.git

udevadm: ensure 'udevadm info -w' show updated result

This seems not necessary, but just for safety.
---

diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c
index 9078a3c2ce2..2c8626ffad2 100644
--- a/src/udev/udevadm-info.c
+++ b/src/udev/udevadm-info.c
@@ -467,9 +467,14 @@ int info_main(int argc, char *argv[], void *userdata) {
                         return log_error_errno(r, "Unknown device \"%s\": %m",  *p);
 
                 if (arg_wait_for_initialization_timeout > 0) {
-                        r = device_wait_for_initialization(device, NULL, arg_wait_for_initialization_timeout, NULL);
+                        sd_device *d;
+
+                        r = device_wait_for_initialization(device, NULL, arg_wait_for_initialization_timeout, &d);
                         if (r < 0)
                                 return r;
+
+                        sd_device_unref(device);
+                        device = d;
                 }
 
                 if (action == ACTION_QUERY)