Message ID | 20180330235454.15972-1-alex.hung@canonical.com (mailing list archive) |
---|---|
State | Accepted, archived |
Delegated to: | Andy Shevchenko |
Headers | show |
On Sat, Mar 31, 2018 at 2:54 AM, Alex Hung <alex.hung@canonical.com> wrote: > KEY_ROTATE_LOCK_TOGGLE is introduced in 4.16 rc1 and this key event is > emitted on Wacom MobileStudio Pro 13. > Pushed to my review and testing queue, thanks! > Signed-off-by: Alex Hung <alex.hung@canonical.com> > Co-developed-by: Jason Gerecke <jason.gerecke@wacom.com> > Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com> > --- > drivers/platform/x86/intel-hid.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c > index 5e3df194723e..93f62d0e2b47 100644 > --- a/drivers/platform/x86/intel-hid.c > +++ b/drivers/platform/x86/intel-hid.c > @@ -67,8 +67,8 @@ static const struct key_entry intel_array_keymap[] = { > { KE_IGNORE, 0xC5, { KEY_VOLUMEUP } }, /* Release */ > { KE_KEY, 0xC6, { KEY_VOLUMEDOWN } }, /* Press */ > { KE_IGNORE, 0xC7, { KEY_VOLUMEDOWN } }, /* Release */ > - { KE_SW, 0xC8, { .sw = { SW_ROTATE_LOCK, 1 } } }, /* Press */ > - { KE_SW, 0xC9, { .sw = { SW_ROTATE_LOCK, 0 } } }, /* Release */ > + { KE_KEY, 0xC8, { KEY_ROTATE_LOCK_TOGGLE } }, /* Press */ > + { KE_IGNORE, 0xC9, { KEY_ROTATE_LOCK_TOGGLE } }, /* Release */ > { KE_KEY, 0xCE, { KEY_POWER } }, /* Press */ > { KE_IGNORE, 0xCF, { KEY_POWER } }, /* Release */ > { KE_END }, > -- > 2.14.1 >
diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c index 5e3df194723e..93f62d0e2b47 100644 --- a/drivers/platform/x86/intel-hid.c +++ b/drivers/platform/x86/intel-hid.c @@ -67,8 +67,8 @@ static const struct key_entry intel_array_keymap[] = { { KE_IGNORE, 0xC5, { KEY_VOLUMEUP } }, /* Release */ { KE_KEY, 0xC6, { KEY_VOLUMEDOWN } }, /* Press */ { KE_IGNORE, 0xC7, { KEY_VOLUMEDOWN } }, /* Release */ - { KE_SW, 0xC8, { .sw = { SW_ROTATE_LOCK, 1 } } }, /* Press */ - { KE_SW, 0xC9, { .sw = { SW_ROTATE_LOCK, 0 } } }, /* Release */ + { KE_KEY, 0xC8, { KEY_ROTATE_LOCK_TOGGLE } }, /* Press */ + { KE_IGNORE, 0xC9, { KEY_ROTATE_LOCK_TOGGLE } }, /* Release */ { KE_KEY, 0xCE, { KEY_POWER } }, /* Press */ { KE_IGNORE, 0xCF, { KEY_POWER } }, /* Release */ { KE_END },