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

Commit 553d16af authored by Marcus Folkesson's avatar Marcus Folkesson Committed by Dmitry Torokhov
Browse files

Input: pegasus_notetaker - do not rely on input_dev->users 



If the device is unused and suspended, a call to open will cause the
device to autoresume through the call to usb_autopm_get_interface().

input_dev->users is already incremented by the input subsystem,
therefore this expression will always be evaluated to true:

	if (pegasus->dev->users && usb_submit_urb(pegasus->irq, GFP_NOIO) < 0)
		retval = -EIO;

The same URB will then be fail when resubmitted in pegasus_open().

Introduce pegasus->is_open to keep track of the state instead.

Signed-off-by: default avatarMarcus Folkesson <marcus.folkesson@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 1f701f6d

drivers/input/tablet/pegasus_notetaker.c

+5 −2
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ struct pegasus { 


	/* serialize access to open/suspend */

	struct mutex pm_mutex;

	bool is_open;



	char name[128];

	char phys[64];
@@ -232,6 +233,7 @@ static int pegasus_open(struct input_dev *dev) 
	if (error)

		goto err_kill_urb;



	pegasus->is_open = true;

	mutex_unlock(&pegasus->pm_mutex);

	return 0;
@@ -251,6 +253,7 @@ static void pegasus_close(struct input_dev *dev) 
	mutex_lock(&pegasus->pm_mutex);

	usb_kill_urb(pegasus->irq);

	cancel_work_sync(&pegasus->init);

	pegasus->is_open = false;

	mutex_unlock(&pegasus->pm_mutex);



	usb_autopm_put_interface(pegasus->intf);
@@ -415,7 +418,7 @@ static int pegasus_resume(struct usb_interface *intf) 
	int retval = 0;



	mutex_lock(&pegasus->pm_mutex);

	if (pegasus->dev->users && usb_submit_urb(pegasus->irq, GFP_NOIO) < 0)

	if (pegasus->is_open && usb_submit_urb(pegasus->irq, GFP_NOIO) < 0)

		retval = -EIO;

	mutex_unlock(&pegasus->pm_mutex);
@@ -428,7 +431,7 @@ static int pegasus_reset_resume(struct usb_interface *intf) 
	int retval = 0;



	mutex_lock(&pegasus->pm_mutex);

	if (pegasus->dev->users) {

	if (pegasus->is_open) {

		retval = pegasus_set_mode(pegasus, PEN_MODE_XY,

					  NOTETAKER_LED_MOUSE);

		if (!retval && usb_submit_urb(pegasus->irq, GFP_NOIO) < 0)