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

Merge tag 'platform-drivers-x86-v4.5-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x86 platform driver fixes from Darren Hart:
"Just two small fixes for the 4.5-rc cycle:

intel_scu_ipcutil:
- underflow in scu_reg_access()

intel-hid:
- fix incorrect entries in intel_hid_keymap"

* tag 'platform-drivers-x86-v4.5-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
intel_scu_ipcutil: underflow in scu_reg_access()
intel-hid: fix incorrect entries in intel_hid_keymap

Linus Torvalds da2f912a 5de6ac75

+2 -3
unified split
+1 -2
drivers/platform/x86/intel-hid.c
··· 41 41 { KE_KEY, 4, { KEY_HOME } }, 42 42 { KE_KEY, 5, { KEY_END } }, 43 43 { KE_KEY, 6, { KEY_PAGEUP } }, 44 - { KE_KEY, 4, { KEY_PAGEDOWN } }, 45 - { KE_KEY, 4, { KEY_HOME } }, 44 + { KE_KEY, 7, { KEY_PAGEDOWN } }, 46 45 { KE_KEY, 8, { KEY_RFKILL } }, 47 46 { KE_KEY, 9, { KEY_POWER } }, 48 47 { KE_KEY, 11, { KEY_SLEEP } },
+1 -1
drivers/platform/x86/intel_scu_ipcutil.c
··· 49 49 50 50 static int scu_reg_access(u32 cmd, struct scu_ipc_data *data) 51 51 { 52 - int count = data->count; 52 + unsigned int count = data->count; 53 53 54 54 if (count == 0 || count == 3 || count > 4) 55 55 return -EINVAL;