hwdb.d/60-keyboard.hwdb

@@ -709,10 +709,6 @@ evdev:name:gpio-keys:phys:gpio-keys/input0:ev:3:dmi:*:svnHewlett-Packard:pnHPStr
 evdev:name:gpio-keys:phys:gpio-keys/input0:ev:23:dmi:*:svnHewlett-Packard:pnHPStream7Tablet:*
  KEYBOARD_KEY_0=unknown
 
-# HP Omen 15
-evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP:pnOMENLaptop15*:pvr*
- KEYBOARD_KEY_a1=!calc
-
 ##########################################################
 # Huawei
 ##########################################################

hwdb.d/60-sensor.hwdb

@@ -403,16 +403,6 @@ sensor:modalias:acpi:KIOX000A*:dmi:bvnAmericanMegatrendsInc.:bvr5.11:bd03/20/201
 sensor:modalias:acpi:KIOX000A*:dmi:bvnAmericanMegatrendsInc.:bvr5.11:bd05/25/2017:svnDefaultstring:pnDefaultstring:pvrDefaultstring:rvnAMICorporation:rnDefaultstring:rvrDefaultstring:cvnDefaultstring:ct3:cvrDefaultstring:*
  ACCEL_LOCATION=base
 
-#########################################
-# Hometech
-########################################
-
-# Nobody bothered to use Linux on any device of this manufacturer
-# so current marks might be too general and need fixes.
-# These values are based on Wi101 model.
-sensor:modalias:acpi:BMA250E*:dmi:*:svnInsyde*:pni101c:*
- ACCEL_MOUNT_MATRIX=0,1,0;-1,0,0;-1,0,0
-
 #########################################
 # HP
 #########################################

src/cryptsetup/cryptsetup-tokens/luks2-fido2.c

@@ -20,6 +20,7 @@ int acquire_luks2_key(
         int r;
         Fido2EnrollFlags required;
         size_t cid_size, salt_size, decrypted_key_size;
+        _cleanup_(json_variant_unrefp) JsonVariant *v = NULL;
         _cleanup_free_ void *cid = NULL, *salt = NULL;
         _cleanup_free_ char *rp_id = NULL;
         _cleanup_(erase_and_freep) void *decrypted_key = NULL;
@@ -52,7 +53,7 @@ int acquire_luks2_key(
                         required,
                         &decrypted_key,
                         &decrypted_key_size);
-        if (r == -ENOLCK) /* libcryptsetup returns -ENOANO also on wrong PIN */
+        if (r == -ENOLCK) /* libcryptsetup returns -ENOANO also on wrong pin */
                 r = -ENOANO;
         if (r < 0)
                 return r;
@@ -60,7 +61,7 @@ int acquire_luks2_key(
         /* Before using this key as passphrase we base64 encode it, for compat with homed */
         r = base64mem(decrypted_key, decrypted_key_size, &base64_encoded);
         if (r < 0)
-                return crypt_log_error_errno(cd, r, "Failed to base64 encode key: %m");
+                return crypt_log_error_errno(cd, r, "Can not base64 encode key: %m");
 
         *ret_keyslot_passphrase = TAKE_PTR(base64_encoded);
         *ret_keyslot_passphrase_size = strlen(*ret_keyslot_passphrase);