[LUCID][PATCH 2/6] HID: fix N-trig touch panel with recent firmware
Chase Douglas
chase.douglas at canonical.com
Mon May 24 13:54:30 UTC 2010
From: Stephane Chatty <chatty at lii-enac.fr>
Added an init message that avoids device freeze with recent firmware.
Signed-off-by: Stephane Chatty <chatty at enac.fr>
Tested-by: Rafi Rubin <rafi at seas.upenn.edu>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
(cherry picked from commit 6549981bc54777c37eccf987e227aff47022ab7c)
BugLink: http://bugs.launchpad.net/bugs/583531
Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
---
drivers/hid/hid-ntrig.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c
index edcc0c4..74b3d98 100644
--- a/drivers/hid/hid-ntrig.c
+++ b/drivers/hid/hid-ntrig.c
@@ -1,8 +1,8 @@
/*
* HID driver for N-Trig touchscreens
*
- * Copyright (c) 2008 Rafi Rubin
- * Copyright (c) 2009 Stephane Chatty
+ * Copyright (c) 2008-2010 Rafi Rubin
+ * Copyright (c) 2009-2010 Stephane Chatty
*
*/
@@ -15,6 +15,8 @@
#include <linux/device.h>
#include <linux/hid.h>
+#include <linux/usb.h>
+#include "usbhid/usbhid.h"
#include <linux/module.h>
#include "hid-ids.h"
@@ -285,6 +287,7 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id)
struct ntrig_data *nd;
struct hid_input *hidinput;
struct input_dev *input;
+ struct hid_report *report;
if (id->driver_data)
hdev->quirks |= HID_QUIRK_MULTI_INPUT;
@@ -348,6 +351,11 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id)
}
}
+ report = hdev->report_enum[HID_FEATURE_REPORT].report_id_hash[0x0a];
+ if (report)
+ usbhid_submit_report(hdev, report, USB_DIR_OUT);
+
+
return 0;
err_free:
kfree(nd);
--
1.7.0.4
More information about the kernel-team
mailing list