diff mbox

HID: multitouch: Add suffix for HID_DG_TOUCHPAD

Message ID 1443450137-139724-1-git-send-email-mika.westerberg@linux.intel.com (mailing list archive)
State New, archived
Delegated to: Jiri Kosina
Headers show

Commit Message

Mika Westerberg Sept. 28, 2015, 2:22 p.m. UTC
Instead of printing "UNKNOWN" as device suffix for HID_DG_TOUCHPAD call
the device as "Touchpad".

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
 drivers/hid/hid-multitouch.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Daniel Martin Sept. 29, 2015, 6:37 a.m. UTC | #1
On 28 September 2015 at 16:22, Mika Westerberg
<mika.westerberg@linux.intel.com> wrote:
> Instead of printing "UNKNOWN" as device suffix for HID_DG_TOUCHPAD call
> the device as "Touchpad".
>
> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
> ---
>  drivers/hid/hid-multitouch.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
> index 426b2f1a3450..661b4fce1a5d 100644
> --- a/drivers/hid/hid-multitouch.c
> +++ b/drivers/hid/hid-multitouch.c
> @@ -968,6 +968,9 @@ static void mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
>                 case HID_DG_TOUCHSCREEN:
>                         /* we do not set suffix = "Touchscreen" */
>                         break;
> +               case HID_DG_TOUCHPAD:
> +                       suffix = "Touchpad";
> +                       break;
>                 case HID_GD_SYSTEM_CONTROL:
>                         suffix = "System Control";
>                         break;
> --

I will drop my locally pending patch for this. ;)

Reviewed-by: Daniel Martin <consume.noise@gmail.com>
--
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
Benjamin Tissoires Sept. 29, 2015, 9:05 a.m. UTC | #2
On Sep 28 2015 or thereabouts, Mika Westerberg wrote:
> Instead of printing "UNKNOWN" as device suffix for HID_DG_TOUCHPAD call
> the device as "Touchpad".
> 
> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
> ---

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

Cheers,
Benjamin

>  drivers/hid/hid-multitouch.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
> index 426b2f1a3450..661b4fce1a5d 100644
> --- a/drivers/hid/hid-multitouch.c
> +++ b/drivers/hid/hid-multitouch.c
> @@ -968,6 +968,9 @@ static void mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
>  		case HID_DG_TOUCHSCREEN:
>  			/* we do not set suffix = "Touchscreen" */
>  			break;
> +		case HID_DG_TOUCHPAD:
> +			suffix = "Touchpad";
> +			break;
>  		case HID_GD_SYSTEM_CONTROL:
>  			suffix = "System Control";
>  			break;
> -- 
> 2.5.1
> 
--
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. 29, 2015, 10:09 a.m. UTC | #3
On Mon, 28 Sep 2015, Mika Westerberg wrote:

> Instead of printing "UNKNOWN" as device suffix for HID_DG_TOUCHPAD call
> the device as "Touchpad".
> 
> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

Applied to hid.git#for-4.4/multitouch.
diff mbox

Patch

diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 426b2f1a3450..661b4fce1a5d 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -968,6 +968,9 @@  static void mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
 		case HID_DG_TOUCHSCREEN:
 			/* we do not set suffix = "Touchscreen" */
 			break;
+		case HID_DG_TOUCHPAD:
+			suffix = "Touchpad";
+			break;
 		case HID_GD_SYSTEM_CONTROL:
 			suffix = "System Control";
 			break;