Merge branch 'benzea/usb-persist' into 'master'

udev-hwdb: Set ID_PERSIST=0 in hwdb

See merge request libfprint/libfprint!327
This commit is contained in:
Benjamin Berg 2021-09-17 10:54:14 +00:00
commit a7de8005e3
2 changed files with 31 additions and 1 deletions

View file

@ -4,6 +4,7 @@
# Supported by libfprint driver aes1610 # Supported by libfprint driver aes1610
usb:v08FFp1600* usb:v08FFp1600*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver aes1660 # Supported by libfprint driver aes1660
usb:v08FFp1660* usb:v08FFp1660*
@ -24,16 +25,19 @@ usb:v08FFp168D*
usb:v08FFp168E* usb:v08FFp168E*
usb:v08FFp168F* usb:v08FFp168F*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver aes2501 # Supported by libfprint driver aes2501
usb:v08FFp2500* usb:v08FFp2500*
usb:v08FFp2580* usb:v08FFp2580*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver aes2550 # Supported by libfprint driver aes2550
usb:v08FFp2550* usb:v08FFp2550*
usb:v08FFp2810* usb:v08FFp2810*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver aes2660 # Supported by libfprint driver aes2660
usb:v08FFp2660* usb:v08FFp2660*
@ -55,19 +59,23 @@ usb:v08FFp268E*
usb:v08FFp268F* usb:v08FFp268F*
usb:v08FFp2691* usb:v08FFp2691*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver aes3500 # Supported by libfprint driver aes3500
usb:v08FFp5731* usb:v08FFp5731*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver aes4000 # Supported by libfprint driver aes4000
usb:v5501p08FF* usb:v5501p08FF*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver egis0570 # Supported by libfprint driver egis0570
usb:v1C7Ap0570* usb:v1C7Ap0570*
usb:v1C7Ap0571* usb:v1C7Ap0571*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver elan # Supported by libfprint driver elan
usb:v04F3p0903* usb:v04F3p0903*
@ -131,14 +139,17 @@ usb:v04F3p0C63*
usb:v04F3p0C6E* usb:v04F3p0C6E*
usb:v04F3p0C58* usb:v04F3p0C58*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver elanmoc # Supported by libfprint driver elanmoc
usb:v04F3p0C7E* usb:v04F3p0C7E*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver etes603 # Supported by libfprint driver etes603
usb:v1C7Ap0603* usb:v1C7Ap0603*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver goodixmoc # Supported by libfprint driver goodixmoc
usb:v27C6p5840* usb:v27C6p5840*
@ -154,10 +165,12 @@ usb:v27C6p6594*
usb:v27C6p659C* usb:v27C6p659C*
usb:v27C6p6A94* usb:v27C6p6A94*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver nb1010 # Supported by libfprint driver nb1010
usb:v298Dp1010* usb:v298Dp1010*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver synaptics # Supported by libfprint driver synaptics
usb:v06CBp00BD* usb:v06CBp00BD*
@ -173,21 +186,25 @@ usb:v06CBp0123*
usb:v06CBp0126* usb:v06CBp0126*
usb:v06CBp0129* usb:v06CBp0129*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver upeksonly # Supported by libfprint driver upeksonly
usb:v147Ep2016* usb:v147Ep2016*
usb:v147Ep1000* usb:v147Ep1000*
usb:v147Ep1001* usb:v147Ep1001*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver upektc # Supported by libfprint driver upektc
usb:v0483p2015* usb:v0483p2015*
usb:v147Ep3001* usb:v147Ep3001*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver upektc_img # Supported by libfprint driver upektc_img
usb:v147Ep2020* usb:v147Ep2020*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver uru4000 # Supported by libfprint driver uru4000
usb:v045Ep00BC* usb:v045Ep00BC*
@ -197,23 +214,28 @@ usb:v05BAp0007*
usb:v05BAp0008* usb:v05BAp0008*
usb:v05BAp000A* usb:v05BAp000A*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver vcom5s # Supported by libfprint driver vcom5s
usb:v061Ap0110* usb:v061Ap0110*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver vfs0050 # Supported by libfprint driver vfs0050
usb:v138Ap0050* usb:v138Ap0050*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver vfs101 # Supported by libfprint driver vfs101
usb:v138Ap0001* usb:v138Ap0001*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver vfs301 # Supported by libfprint driver vfs301
usb:v138Ap0005* usb:v138Ap0005*
usb:v138Ap0008* usb:v138Ap0008*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver vfs5011 # Supported by libfprint driver vfs5011
usb:v138Ap0010* usb:v138Ap0010*
@ -222,10 +244,12 @@ usb:v138Ap0015*
usb:v138Ap0017* usb:v138Ap0017*
usb:v138Ap0018* usb:v138Ap0018*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Supported by libfprint driver vfs7552 # Supported by libfprint driver vfs7552
usb:v138Ap0091* usb:v138Ap0091*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0
# Known unsupported devices # Known unsupported devices
usb:v04F3p036B* usb:v04F3p036B*
@ -257,6 +281,7 @@ usb:v0A5Cp5840*
usb:v0A5Cp5841* usb:v0A5Cp5841*
usb:v0A5Cp5842* usb:v0A5Cp5842*
usb:v0A5Cp5843* usb:v0A5Cp5843*
usb:v0A5Cp5844*
usb:v0A5Cp5845* usb:v0A5Cp5845*
usb:v10A5p0007* usb:v10A5p0007*
usb:v1188p9545* usb:v1188p9545*
@ -299,3 +324,4 @@ usb:v2808p9338*
usb:v298Dp2033* usb:v298Dp2033*
usb:v3538p0930* usb:v3538p0930*
ID_AUTOSUSPEND=1 ID_AUTOSUSPEND=1
ID_PERSIST=0

View file

@ -58,6 +58,7 @@ static const FpIdEntry whitelist_id_table[] = {
{ .vid = 0x0a5c, .pid = 0x5841 }, { .vid = 0x0a5c, .pid = 0x5841 },
{ .vid = 0x0a5c, .pid = 0x5842 }, { .vid = 0x0a5c, .pid = 0x5842 },
{ .vid = 0x0a5c, .pid = 0x5843 }, { .vid = 0x0a5c, .pid = 0x5843 },
{ .vid = 0x0a5c, .pid = 0x5844 },
{ .vid = 0x0a5c, .pid = 0x5845 }, { .vid = 0x0a5c, .pid = 0x5845 },
{ .vid = 0x10a5, .pid = 0x0007 }, { .vid = 0x10a5, .pid = 0x0007 },
{ .vid = 0x1188, .pid = 0x9545 }, { .vid = 0x1188, .pid = 0x9545 },
@ -166,7 +167,10 @@ print_driver (const FpDeviceClass *cls)
} }
if (num_printed > 0) if (num_printed > 0)
g_print (" ID_AUTOSUSPEND=1\n"); {
g_print (" ID_AUTOSUSPEND=1\n");
g_print (" ID_PERSIST=0\n");
}
} }
static int static int