Merge 587c3d4c06 into 2e5b0412f9

The KEY_102ND and KEY_GRAVE keys are switched on the
Logitech MX Keys for Mac, so switch them back

hwdb.d/60-keyboard.hwdb

@@ -1440,8 +1440,8 @@ evdev:input:b0003v046DpC309*
 
 # Logitech MX Keys for Mac
 evdev:input:b0003v046Dp4092*
- KEYBOARD_KEY_70035=102nd                               # '<' key
- KEYBOARD_KEY_70064=grave                               # '^' key
+ KEYBOARD_KEY_70035=102nd
+ KEYBOARD_KEY_70064=grave
 
 ###########################################################
 # Maxdata

src/basic/cgroup-util.c

@@ -799,7 +799,7 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **ret_path) {
                                 continue;
                 }
 
-                _cleanup_free_ char *path = strdup(e + 1);
+                char *path = strdup(e + 1);
                 if (!path)
                         return -ENOMEM;
 
@@ -812,7 +812,7 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **ret_path) {
                 if (e)
                         *e = 0;
 
-                *ret_path = TAKE_PTR(path);
+                *ret_path = path;
                 return 0;
         }
 }