tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 02982f85 936fd005

+1 -6
-1
scripts/mod/devicetable-offsets.c
··· 105 105 DEVID_FIELD(input_device_id, sndbit); 106 106 DEVID_FIELD(input_device_id, ffbit); 107 107 DEVID_FIELD(input_device_id, swbit); 108 - DEVID_FIELD(input_device_id, propbit); 109 108 110 109 DEVID(eisa_device_id); 111 110 DEVID_FIELD(eisa_device_id, sig);
+1 -5
scripts/mod/file2alias.c
··· 761 761 sprintf(alias + strlen(alias), "%X,*", i); 762 762 } 763 763 764 - /* input:b0v0p0e0-eXkXrXaXmXlXsXfXwXprX where X is comma-separated %02X. */ 764 + /* input:b0v0p0e0-eXkXrXaXmXlXsXfXwX where X is comma-separated %02X. */ 765 765 static int do_input_entry(const char *filename, void *symval, 766 766 char *alias) 767 767 { ··· 779 779 DEF_FIELD_ADDR(symval, input_device_id, sndbit); 780 780 DEF_FIELD_ADDR(symval, input_device_id, ffbit); 781 781 DEF_FIELD_ADDR(symval, input_device_id, swbit); 782 - DEF_FIELD_ADDR(symval, input_device_id, propbit); 783 782 784 783 sprintf(alias, "input:"); 785 784 ··· 816 817 sprintf(alias + strlen(alias), "w*"); 817 818 if (flags & INPUT_DEVICE_ID_MATCH_SWBIT) 818 819 do_input(alias, *swbit, 0, INPUT_DEVICE_ID_SW_MAX); 819 - sprintf(alias + strlen(alias), "pr*"); 820 - if (flags & INPUT_DEVICE_ID_MATCH_PROPBIT) 821 - do_input(alias, *propbit, 0, INPUT_DEVICE_ID_PROP_MAX); 822 820 return 1; 823 821 } 824 822 ADD_TO_DEVTABLE("input", input_device_id, do_input_entry);