Commit 6549981b authored by Stephane Chatty's avatar Stephane Chatty Committed by Jiri Kosina
Browse files

HID: fix N-trig touch panel with recent firmware 



Added an init message that avoids device freeze with recent firmware.

Signed-off-by: default avatarStephane Chatty <chatty@enac.fr>
Tested-by: default avatarRafi Rubin <rafi@seas.upenn.edu>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent ab195c58

drivers/hid/hid-ntrig.c

+10 −2
Original line number Diff line number Diff line 
/*

 *  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 <linux/slab.h>
@@ -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;
@@ -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);