Skip to content

Commit

Permalink
HID: fix N-trig touch panel with recent firmware
Browse files Browse the repository at this point in the history
Added an init message that avoids device freeze with recent firmware.

Signed-off-by: Stephane Chatty <chatty@enac.fr>
Tested-by: Rafi Rubin <rafi@seas.upenn.edu>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Stephane Chatty authored and Jiri Kosina committed Apr 6, 2010
1 parent ab195c5 commit 6549981
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions drivers/hid/hid-ntrig.c
Original file line number Diff line number Diff line change
@@ -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
*
*/

Expand All @@ -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 <linux/slab.h>

Expand Down Expand Up @@ -286,6 +288,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;
Expand Down Expand Up @@ -349,6 +352,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);
Expand Down

0 comments on commit 6549981

Please sign in to comment.