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

Commit 02982f85 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input fix from Dmitry Torokhov:
 "A fix for a broken commit in the previous pull breaking automatic
  module loading of input handlers, such ad evdev"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: do not use property bits when generating module alias
parents 936fd005 09c3e01b

scripts/mod/devicetable-offsets.c

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

	DEVID_FIELD(input_device_id, sndbit);

	DEVID_FIELD(input_device_id, ffbit);

	DEVID_FIELD(input_device_id, ffbit);

	DEVID_FIELD(input_device_id, swbit);

	DEVID_FIELD(input_device_id, swbit);

	DEVID_FIELD(input_device_id, propbit);





	DEVID(eisa_device_id);

	DEVID(eisa_device_id);

	DEVID_FIELD(eisa_device_id, sig);

	DEVID_FIELD(eisa_device_id, sig);

scripts/mod/file2alias.c

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

			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,

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

			  char *alias)

			  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, sndbit);

	DEF_FIELD_ADDR(symval, input_device_id, ffbit);

	DEF_FIELD_ADDR(symval, input_device_id, ffbit);

	DEF_FIELD_ADDR(symval, input_device_id, swbit);

	DEF_FIELD_ADDR(symval, input_device_id, swbit);

	DEF_FIELD_ADDR(symval, input_device_id, propbit);





	sprintf(alias, "input:");

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

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

	if (flags & INPUT_DEVICE_ID_MATCH_SWBIT)

	if (flags & INPUT_DEVICE_ID_MATCH_SWBIT)

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

		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;

	return 1;

}

}

ADD_TO_DEVTABLE("input", input_device_id, do_input_entry);

ADD_TO_DEVTABLE("input", input_device_id, do_input_entry);