Commit 966334df authored by Derek Basehore's avatar Derek Basehore Committed by Dmitry Torokhov
Browse files

Input: elan_i2c - only increment wakeup count on touch 



This moves the wakeup increment for elan devices to the touch report.
This prevents the drivers from incorrectly reporting a wakeup when the
resume callback resets then device, which causes an interrupt to
occur.

Signed-off-by: default avatarDerek Basehore <dbasehore@chromium.org>
Link: https://lore.kernel.org/r/20200706235046.1984283-1-dbasehore@chromium.org


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent dcb00fc7

drivers/input/mouse/elan_i2c_core.c

+5 −4
Original line number Diff line number Diff line
@@ -951,6 +951,8 @@ static void elan_report_absolute(struct elan_tp_data *data, u8 *packet) 
	u8 hover_info = packet[ETP_HOVER_INFO_OFFSET];

	bool contact_valid, hover_event;



	pm_wakeup_event(&data->client->dev, 0);



	hover_event = hover_info & 0x40;

	for (i = 0; i < ETP_MAX_FINGERS; i++) {

		contact_valid = tp_info & (1U << (3 + i));
@@ -974,6 +976,8 @@ static void elan_report_trackpoint(struct elan_tp_data *data, u8 *report) 
	u8 *packet = &report[ETP_REPORT_ID_OFFSET + 1];

	int x, y;



	pm_wakeup_event(&data->client->dev, 0);



	if (!data->tp_input) {

		dev_warn_once(&data->client->dev,

			      "received a trackpoint report while no trackpoint device has been created. Please report upstream.\n");
@@ -998,7 +1002,6 @@ static void elan_report_trackpoint(struct elan_tp_data *data, u8 *report) 
static irqreturn_t elan_isr(int irq, void *dev_id)

{

	struct elan_tp_data *data = dev_id;

	struct device *dev = &data->client->dev;

	int error;

	u8 report[ETP_MAX_REPORT_LEN];
@@ -1016,8 +1019,6 @@ static irqreturn_t elan_isr(int irq, void *dev_id) 
	if (error)

		goto out;



	pm_wakeup_event(dev, 0);



	switch (report[ETP_REPORT_ID_OFFSET]) {

	case ETP_REPORT_ID:

		elan_report_absolute(data, report);
@@ -1026,7 +1027,7 @@ static irqreturn_t elan_isr(int irq, void *dev_id) 
		elan_report_trackpoint(data, report);

		break;

	default:

		dev_err(dev, "invalid report id data (%x)\n",

		dev_err(&data->client->dev, "invalid report id data (%x)\n",

			report[ETP_REPORT_ID_OFFSET]);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE