platform-drivers-x86 for 4.5-3
intel_scu_ipcutil: - underflow in scu_reg_access() intel-hid: - fix incorrect entries in intel_hid_keymap -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJWvB16AAoJEKbMaAwKp3647mYH/3ACKkSu/xt63RXwCRCbKML3 NNnBzYZw6welU4sVs0gVKHtZs89X/9mYr28t2C8O0GpVRx/Gwqkog9Mqesj8aj5B pYa4gX1ZiEsAxpouQ3TBl78W0YjpyhpjKWqczVDa+q+k6GIB9kFTgg9z0ywRB+b4 422ajdKxFg7CNi2ucbvO3ihCgLMMPie2csGeUBevUncXlciaitjqLVhstnxgUyK0 KXB18rBZLwud5MCSLeveboHStQJMwK8im1m2f86xohVo8IAd691HLOJunPJpsI9E 6pV9Ar26kaSsmMqgKeTGTbqPmZFdjfZjOhajzcIGFXpuEDrtZ2fUvCcgl8irK7o= =Zx2F -----END PGP SIGNATURE----- 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
This commit is contained in:
Коммит
da2f912aef
|
@ -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 } },
|
||||
|
|
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче