From patchwork Mon Mar 8 21:13:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mickib1@gmail.com X-Patchwork-Id: 84156 X-Patchwork-Delegate: jikos@jikos.cz Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o28LFKXL031566 for ; Mon, 8 Mar 2010 21:15:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755927Ab0CHVOo (ORCPT ); Mon, 8 Mar 2010 16:14:44 -0500 Received: from mail-fx0-f219.google.com ([209.85.220.219]:62249 "EHLO mail-fx0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755537Ab0CHVOJ (ORCPT ); Mon, 8 Mar 2010 16:14:09 -0500 Received: by mail-fx0-f219.google.com with SMTP id 19so6803589fxm.21 for ; Mon, 08 Mar 2010 13:14:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:mime-version :content-type:content-transfer-encoding; bh=/xkhUfl1t8QBp44Jhp5m5nDwRy0Q5SP/jE0msCVcJ4I=; b=NQf1tF2k21z38LWIXaDJSgol7aYewzR4juqZE5ITubuRtpkYMjimJfIaoGzgm6luS/ v8w26pPqnxqaeQ6fP8UZtkXqpQKFUHTEwD6//3+FVC1fW635jWEgtSv4ut1/dS6CDXvY 2jSKwFzTyzS5B+qJqq8j9OChBB7NoFzivcyJk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; b=Vg91pPFYomN17x/YN0pcektXUd81M5jNOVWo5AuolpuBgCnB74SJTA5cBjnobw7K11 6NwoftyLtErrgKwMkQQx1CzJSxNBcfX4SAw7U5dyCFw2jeI9fPx8/xJousXYRsOJErUK PI5j+9ew2T7NQzsSpIaY9/cp7VYOQXX9L0yYk= Received: by 10.102.235.36 with SMTP id i36mr262943muh.56.1268082848461; Mon, 08 Mar 2010 13:14:08 -0800 (PST) Received: from localhost.localdomain (bzq-84-108-117-55.cablep.bezeqint.net [84.108.117.55]) by mx.google.com with ESMTPS id y37sm9818207mug.52.2010.03.08.13.14.07 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 08 Mar 2010 13:14:08 -0800 (PST) From: mickib1@gmail.com To: jkosina@suse.cz, rafi@seas.upenn.edu, chatty@enac.fr, peterhuewe@gmx.de, micki@n-trig.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/7] HID: N-trig MTM Driver fix And cleanup patch 5 Date: Mon, 8 Mar 2010 23:13:45 +0200 Message-Id: <1268082827-2680-5-git-send-email-micki@n-trig.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1268082827-2680-4-git-send-email-micki@n-trig.com> References: <1268082827-2680-1-git-send-email-micki@n-trig.com> <1268082827-2680-2-git-send-email-micki@n-trig.com> <1268082827-2680-3-git-send-email-micki@n-trig.com> <1268082827-2680-4-git-send-email-micki@n-trig.com> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 08 Mar 2010 21:15:20 +0000 (UTC) diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c index 8cdb3c2..8bf796c 100644 --- a/drivers/hid/hid-ntrig.c +++ b/drivers/hid/hid-ntrig.c @@ -19,6 +19,8 @@ * 1.3 - N-trig - Change ntrig_input_mapped * 1.4 - N-trig - Add ntrig_send_report function * send set feature command to firmware + * 1.5 - N-trig udpate ntrig_probe + * add call to ntrig_send_report function */ /* @@ -415,11 +417,6 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id) { int ret; struct ntrig_data *nd; - struct hid_input *hidinput; - struct input_dev *input; - - if (id->driver_data) - hdev->quirks |= HID_QUIRK_MULTI_INPUT; nd = kmalloc(sizeof(struct ntrig_data), GFP_KERNEL); if (!nd) { @@ -427,7 +424,6 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id) return -ENOMEM; } - nd->reading_mt = 0; hid_set_drvdata(hdev, nd); ret = hid_parse(hdev); @@ -442,35 +438,10 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id) goto err_free; } - - list_for_each_entry(hidinput, &hdev->inputs, list) { - input = hidinput->input; - switch (hidinput->report->field[0]->application) { - case HID_DG_PEN: - input->name = "N-Trig Pen"; - break; - case HID_DG_TOUCHSCREEN: - __clear_bit(BTN_TOOL_PEN, input->keybit); - /* - * A little something special to enable - * two and three finger taps. - */ - __set_bit(BTN_TOOL_DOUBLETAP, input->keybit); - __set_bit(BTN_TOOL_TRIPLETAP, input->keybit); - __set_bit(BTN_TOOL_QUADTAP, input->keybit); - /* - * The physical touchscreen (single touch) - * input has a value for physical, whereas - * the multitouch only has logical input - * fields. - */ - input->name = - (hidinput->report->field[0] - ->physical) ? - "N-Trig Touchscreen" : - "N-Trig MultiTouch"; - break; - } + ret = ntrig_send_report(hdev); + if (ret) { + dev_err(&hdev->dev, "send set feature failed\n"); + goto err_free; } return 0;