Skip to content

Commit da2f912

Browse files
committed
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
2 parents 5de6ac7 + b1d353a commit da2f912

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

drivers/platform/x86/intel-hid.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ static const struct key_entry intel_hid_keymap[] = {
4141
{ KE_KEY, 4, { KEY_HOME } },
4242
{ KE_KEY, 5, { KEY_END } },
4343
{ KE_KEY, 6, { KEY_PAGEUP } },
44-
{ KE_KEY, 4, { KEY_PAGEDOWN } },
45-
{ KE_KEY, 4, { KEY_HOME } },
44+
{ KE_KEY, 7, { KEY_PAGEDOWN } },
4645
{ KE_KEY, 8, { KEY_RFKILL } },
4746
{ KE_KEY, 9, { KEY_POWER } },
4847
{ KE_KEY, 11, { KEY_SLEEP } },

drivers/platform/x86/intel_scu_ipcutil.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ struct scu_ipc_data {
4949

5050
static int scu_reg_access(u32 cmd, struct scu_ipc_data *data)
5151
{
52-
int count = data->count;
52+
unsigned int count = data->count;
5353

5454
if (count == 0 || count == 3 || count > 4)
5555
return -EINVAL;

0 commit comments

Comments
 (0)