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

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
...@@ -80,6 +80,7 @@ struct pegasus { ...@@ -80,6 +80,7 @@ struct pegasus {
/* serialize access to open/suspend */ /* serialize access to open/suspend */
struct mutex pm_mutex; struct mutex pm_mutex;
bool is_open;
char name[128]; char name[128];
char phys[64]; char phys[64];
...@@ -232,6 +233,7 @@ static int pegasus_open(struct input_dev *dev) ...@@ -232,6 +233,7 @@ static int pegasus_open(struct input_dev *dev)
if (error) if (error)
goto err_kill_urb; goto err_kill_urb;
pegasus->is_open = true;
mutex_unlock(&pegasus->pm_mutex); mutex_unlock(&pegasus->pm_mutex);
return 0; return 0;
...@@ -251,6 +253,7 @@ static void pegasus_close(struct input_dev *dev) ...@@ -251,6 +253,7 @@ static void pegasus_close(struct input_dev *dev)
mutex_lock(&pegasus->pm_mutex); mutex_lock(&pegasus->pm_mutex);
usb_kill_urb(pegasus->irq); usb_kill_urb(pegasus->irq);
cancel_work_sync(&pegasus->init); cancel_work_sync(&pegasus->init);
pegasus->is_open = false;
mutex_unlock(&pegasus->pm_mutex); mutex_unlock(&pegasus->pm_mutex);
usb_autopm_put_interface(pegasus->intf); usb_autopm_put_interface(pegasus->intf);
...@@ -415,7 +418,7 @@ static int pegasus_resume(struct usb_interface *intf) ...@@ -415,7 +418,7 @@ static int pegasus_resume(struct usb_interface *intf)
int retval = 0; int retval = 0;
mutex_lock(&pegasus->pm_mutex); 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; retval = -EIO;
mutex_unlock(&pegasus->pm_mutex); mutex_unlock(&pegasus->pm_mutex);
...@@ -428,7 +431,7 @@ static int pegasus_reset_resume(struct usb_interface *intf) ...@@ -428,7 +431,7 @@ static int pegasus_reset_resume(struct usb_interface *intf)
int retval = 0; int retval = 0;
mutex_lock(&pegasus->pm_mutex); mutex_lock(&pegasus->pm_mutex);
if (pegasus->dev->users) { if (pegasus->is_open) {
retval = pegasus_set_mode(pegasus, PEN_MODE_XY, retval = pegasus_set_mode(pegasus, PEN_MODE_XY,
NOTETAKER_LED_MOUSE); NOTETAKER_LED_MOUSE);
if (!retval && usb_submit_urb(pegasus->irq, GFP_NOIO) < 0) if (!retval && usb_submit_urb(pegasus->irq, GFP_NOIO) < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment