Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752626AbbEABUX (ORCPT ); Thu, 30 Apr 2015 21:20:23 -0400 Received: from mail-qg0-f54.google.com ([209.85.192.54]:34781 "EHLO mail-qg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751100AbbEABUU (ORCPT ); Thu, 30 Apr 2015 21:20:20 -0400 MIME-Version: 1.0 In-Reply-To: <1430441515-30122-1-git-send-email-killertofu@gmail.com> References: <1430441515-30122-1-git-send-email-killertofu@gmail.com> Date: Thu, 30 Apr 2015 18:20:19 -0700 Message-ID: Subject: Re: [PATCH 1/3] HID: wacom: Do not add suffix to name of devices with an unknown type From: Ping Cheng To: Jason Gerecke Cc: Jiri Kosina , Benjamin Tissoires , linux-input , "linux-kernel@vger.kernel.org" , Jason Gerecke Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2080 Lines: 53 On Thu, Apr 30, 2015 at 5:51 PM, Jason Gerecke wrote: > The naming logic currently assumes that all devices will be a pen, finger, > or pad. Though this has historically been the case, the new HID_GENERIC > catch-all may cause us to probe devices with Wacom's 056A VID which aren't > any of these types (e.g. the "Cintiq 24HDT Monitor Control"). This patch > updates the logic so that no suffix will be added to the device name if > the device type is unknown. > > Signed-off-by: Jason Gerecke Reviewed-by: Ping Cheng for the whole set. Cheers, Ping > --- > drivers/hid/wacom_sys.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c > index 9c57ac0..222baf5 100644 > --- a/drivers/hid/wacom_sys.c > +++ b/drivers/hid/wacom_sys.c > @@ -1440,12 +1440,15 @@ static void wacom_update_name(struct wacom *wacom) > snprintf(wacom_wac->pad_name, sizeof(wacom_wac->pad_name), > "%s Pad", wacom_wac->name); > > - if (features->device_type != BTN_TOOL_FINGER) > + if (features->device_type == BTN_TOOL_PEN) { > strlcat(wacom_wac->name, " Pen", WACOM_NAME_MAX); > - else if (features->touch_max) > - strlcat(wacom_wac->name, " Finger", WACOM_NAME_MAX); > - else > - strlcat(wacom_wac->name, " Pad", WACOM_NAME_MAX); > + } > + else if (features->device_type == BTN_TOOL_FINGER) { > + if (features->touch_max) > + strlcat(wacom_wac->name, " Finger", WACOM_NAME_MAX); > + else > + strlcat(wacom_wac->name, " Pad", WACOM_NAME_MAX); > + } > } > > static int wacom_probe(struct hid_device *hdev, > -- > 2.3.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/