Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09c3e01b authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: do not use property bits when generating module alias 



The commit 8724ecb0 ("Input: allow matching device IDs on property
bits") started using property bits when generating module aliases for input
handlers, but did not adjust the generation of MODALIAS attribute on input
device uevents, breaking automatic module loading. Given that no handler
currently uses property bits in their module tables, let's revert this part
of the commit for now.

Reported-by: default avatarDamien Wyart <damien.wyart@gmail.com>
Tested-by: default avatarDamien Wyart <damien.wyart@gmail.com>
Fixes: 8724ecb0 ("Input: allow matching device IDs on property bits")
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent ea04efee

scripts/mod/devicetable-offsets.c

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ int main(void) 
	DEVID_FIELD(input_device_id, sndbit);

	DEVID_FIELD(input_device_id, ffbit);

	DEVID_FIELD(input_device_id, swbit);

	DEVID_FIELD(input_device_id, propbit);



	DEVID(eisa_device_id);

	DEVID_FIELD(eisa_device_id, sig);

scripts/mod/file2alias.c

+1 −5
Original line number Diff line number Diff line
@@ -761,7 +761,7 @@ static void do_input(char *alias, 
			sprintf(alias + strlen(alias), "%X,*", i);

}



/* input:b0v0p0e0-eXkXrXaXmXlXsXfXwXprX where X is comma-separated %02X. */

/* input:b0v0p0e0-eXkXrXaXmXlXsXfXwX where X is comma-separated %02X. */

static int do_input_entry(const char *filename, void *symval,

			  char *alias)

{
@@ -779,7 +779,6 @@ static int do_input_entry(const char *filename, void *symval, 
	DEF_FIELD_ADDR(symval, input_device_id, sndbit);

	DEF_FIELD_ADDR(symval, input_device_id, ffbit);

	DEF_FIELD_ADDR(symval, input_device_id, swbit);

	DEF_FIELD_ADDR(symval, input_device_id, propbit);



	sprintf(alias, "input:");
@@ -817,9 +816,6 @@ static int do_input_entry(const char *filename, void *symval, 
	sprintf(alias + strlen(alias), "w*");

	if (flags & INPUT_DEVICE_ID_MATCH_SWBIT)

		do_input(alias, *swbit, 0, INPUT_DEVICE_ID_SW_MAX);

	sprintf(alias + strlen(alias), "pr*");

	if (flags & INPUT_DEVICE_ID_MATCH_PROPBIT)

		do_input(alias, *propbit, 0, INPUT_DEVICE_ID_PROP_MAX);

	return 1;

}

ADD_TO_DEVTABLE("input", input_device_id, do_input_entry);