diff mbox

HID: multitouch: Fix system-control buttons not working

Message ID 20170822063752.3235-1-hdegoede@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Hans de Goede Aug. 22, 2017, 6:37 a.m. UTC
Some laptops have system-control buttons (e.g. KEY_SLEEP) on the same
interface as a hid-multitouch touch-pad.

This commit fixes these buttons not working.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/hid/hid-multitouch.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Benjamin Tissoires Aug. 22, 2017, 8:59 a.m. UTC | #1
On Aug 22 2017 or thereabouts, Hans de Goede wrote:
> Some laptops have system-control buttons (e.g. KEY_SLEEP) on the same
> interface as a hid-multitouch touch-pad.
> 
> This commit fixes these buttons not working.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---

Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>

>  drivers/hid/hid-multitouch.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
> index 0a8689bb08e9..53d1413cd435 100644
> --- a/drivers/hid/hid-multitouch.c
> +++ b/drivers/hid/hid-multitouch.c
> @@ -930,6 +930,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
>  	    field->application != HID_DG_PEN &&
>  	    field->application != HID_DG_TOUCHPAD &&
>  	    field->application != HID_GD_KEYBOARD &&
> +	    field->application != HID_GD_SYSTEM_CONTROL &&
>  	    field->application != HID_CP_CONSUMER_CONTROL &&
>  	    field->application != HID_GD_WIRELESS_RADIO_CTLS &&
>  	    !(field->application == HID_VD_ASUS_CUSTOM_MEDIA_KEYS &&
> -- 
> 2.13.4
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Hans de Goede Aug. 22, 2017, 10:08 a.m. UTC | #2
Hi,

On 22-08-17 10:59, Benjamin Tissoires wrote:
> On Aug 22 2017 or thereabouts, Hans de Goede wrote:
>> Some laptops have system-control buttons (e.g. KEY_SLEEP) on the same
>> interface as a hid-multitouch touch-pad.
>>
>> This commit fixes these buttons not working.
>>
>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>> ---
> 
> Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>

Thanks.

Note this applies on top of:

https://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git/log/?h=for-4.14/multitouch

(in case that was not clear)

Regards,

Hans


> 
>>   drivers/hid/hid-multitouch.c | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
>> index 0a8689bb08e9..53d1413cd435 100644
>> --- a/drivers/hid/hid-multitouch.c
>> +++ b/drivers/hid/hid-multitouch.c
>> @@ -930,6 +930,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
>>   	    field->application != HID_DG_PEN &&
>>   	    field->application != HID_DG_TOUCHPAD &&
>>   	    field->application != HID_GD_KEYBOARD &&
>> +	    field->application != HID_GD_SYSTEM_CONTROL &&
>>   	    field->application != HID_CP_CONSUMER_CONTROL &&
>>   	    field->application != HID_GD_WIRELESS_RADIO_CTLS &&
>>   	    !(field->application == HID_VD_ASUS_CUSTOM_MEDIA_KEYS &&
>> -- 
>> 2.13.4
>>
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Hans de Goede Aug. 31, 2017, 3:35 p.m. UTC | #3
Hi,

On 22-08-17 08:37, Hans de Goede wrote:
> Some laptops have system-control buttons (e.g. KEY_SLEEP) on the same
> interface as a hid-multitouch touch-pad.
> 
> This commit fixes these buttons not working.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

What is the status of this patch ? It would be nice to get this
bug-fix into 4.14.

Regards,

Hans



> ---
>   drivers/hid/hid-multitouch.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
> index 0a8689bb08e9..53d1413cd435 100644
> --- a/drivers/hid/hid-multitouch.c
> +++ b/drivers/hid/hid-multitouch.c
> @@ -930,6 +930,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
>   	    field->application != HID_DG_PEN &&
>   	    field->application != HID_DG_TOUCHPAD &&
>   	    field->application != HID_GD_KEYBOARD &&
> +	    field->application != HID_GD_SYSTEM_CONTROL &&
>   	    field->application != HID_CP_CONSUMER_CONTROL &&
>   	    field->application != HID_GD_WIRELESS_RADIO_CTLS &&
>   	    !(field->application == HID_VD_ASUS_CUSTOM_MEDIA_KEYS &&
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jiri Kosina Sept. 5, 2017, 9:42 a.m. UTC | #4
On Thu, 31 Aug 2017, Hans de Goede wrote:

> > Some laptops have system-control buttons (e.g. KEY_SLEEP) on the same
> > interface as a hid-multitouch touch-pad.
> > 
> > This commit fixes these buttons not working.
> > 
> > Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> 
> What is the status of this patch ? It would be nice to get this
> bug-fix into 4.14.

I have been on vacation for past 14 days. I'll process this patch in the 
second wave once current merge window pull request is processed, and will 
be applied still as 4.14 bugfix.
Hans de Goede Sept. 5, 2017, 10:04 a.m. UTC | #5
Hi,

On 05-09-17 11:42, Jiri Kosina wrote:
> On Thu, 31 Aug 2017, Hans de Goede wrote:
> 
>>> Some laptops have system-control buttons (e.g. KEY_SLEEP) on the same
>>> interface as a hid-multitouch touch-pad.
>>>
>>> This commit fixes these buttons not working.
>>>
>>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>>
>> What is the status of this patch ? It would be nice to get this
>> bug-fix into 4.14.
> 
> I have been on vacation for past 14 days. I'll process this patch in the
> second wave once current merge window pull request is processed, and will
> be applied still as 4.14 bugfix.

Great, thank you.

Regards,

Hans

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jiri Kosina Sept. 6, 2017, 8:54 a.m. UTC | #6
On Tue, 22 Aug 2017, Hans de Goede wrote:

> Some laptops have system-control buttons (e.g. KEY_SLEEP) on the same
> interface as a hid-multitouch touch-pad.
> 
> This commit fixes these buttons not working.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Applied to for-4.14/upstream-fixes.
diff mbox

Patch

diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 0a8689bb08e9..53d1413cd435 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -930,6 +930,7 @@  static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
 	    field->application != HID_DG_PEN &&
 	    field->application != HID_DG_TOUCHPAD &&
 	    field->application != HID_GD_KEYBOARD &&
+	    field->application != HID_GD_SYSTEM_CONTROL &&
 	    field->application != HID_CP_CONSUMER_CONTROL &&
 	    field->application != HID_GD_WIRELESS_RADIO_CTLS &&
 	    !(field->application == HID_VD_ASUS_CUSTOM_MEDIA_KEYS &&