Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f68a95cd authored by Dudley Du's avatar Dudley Du Committed by Dmitry Torokhov
Browse files

Input: cyapa - fix resuming the device 



Chage b1cfa7b4 tried to get away form using
irq in cyapa structure and use client->irq instead, but missed a couple of
spots making the touchpad inoperative after resume.

Reported-by: default avatarJeremiah Mahler <jmmahler@gmail.com>
Signed-off-by: default avatarDudley Du <dudley.dulixin@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent f2d347ff

drivers/input/mouse/cyapa.c

+3 −4
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ struct cyapa { 
	struct i2c_client *client;

	struct input_dev *input;

	char phys[32];	/* device physical location */

	int irq;

	bool irq_wake;  /* irq wake is enabled */

	bool smbus;
@@ -938,7 +937,7 @@ static int __maybe_unused cyapa_suspend(struct device *dev) 
			 power_mode, error);



	if (device_may_wakeup(dev))

		cyapa->irq_wake = (enable_irq_wake(cyapa->irq) == 0);

		cyapa->irq_wake = (enable_irq_wake(client->irq) == 0);



	mutex_unlock(&input->mutex);
@@ -956,7 +955,7 @@ static int __maybe_unused cyapa_resume(struct device *dev) 
	mutex_lock(&input->mutex);



	if (device_may_wakeup(dev) && cyapa->irq_wake)

		disable_irq_wake(cyapa->irq);

		disable_irq_wake(client->irq);



	power_mode = input->users ? PWR_MODE_FULL_ACTIVE : PWR_MODE_OFF;

	error = cyapa_set_power_mode(cyapa, PWR_MODE_FULL_ACTIVE);
@@ -964,7 +963,7 @@ static int __maybe_unused cyapa_resume(struct device *dev) 
		dev_warn(dev, "resume: set power mode to %d failed: %d\n",

			 power_mode, error);



	enable_irq(cyapa->irq);

	enable_irq(client->irq);



	mutex_unlock(&input->mutex);