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

Commit da2f912a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v4.5-3' of... 

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
parents 5de6ac75 b1d353ad

drivers/platform/x86/intel-hid.c

+1 −2
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ static const struct key_entry intel_hid_keymap[] = { 
	{ KE_KEY, 4, { KEY_HOME } },

	{ KE_KEY, 5, { KEY_END } },

	{ KE_KEY, 6, { KEY_PAGEUP } },

	{ KE_KEY, 4, { KEY_PAGEDOWN } },

	{ KE_KEY, 4, { KEY_HOME } },

	{ KE_KEY, 7, { KEY_PAGEDOWN } },

	{ KE_KEY, 8, { KEY_RFKILL } },

	{ KE_KEY, 9, { KEY_POWER } },

	{ KE_KEY, 11, { KEY_SLEEP } },

drivers/platform/x86/intel_scu_ipcutil.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ struct scu_ipc_data { 


static int scu_reg_access(u32 cmd, struct scu_ipc_data  *data)

{

	int count = data->count;

	unsigned int count = data->count;



	if (count == 0 || count == 3 || count > 4)

		return -EINVAL;