Commit 9d3bef0b authored by Martin Kepplinger's avatar Martin Kepplinger Committed by Dmitry Torokhov

Input: pegasus_notetaker - fix usb_autopm calls to be balanced

We should only "put" the interface if submitting URB or setting tablet mode
in pegasus_open() fails, otherwise leave it to pegasus_close().
Signed-off-by: default avatarMartin Kepplinger <martink@posteo.de>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 168c1398
...@@ -209,34 +209,39 @@ static void pegasus_init(struct work_struct *work) ...@@ -209,34 +209,39 @@ static void pegasus_init(struct work_struct *work)
static int pegasus_open(struct input_dev *dev) static int pegasus_open(struct input_dev *dev)
{ {
struct pegasus *pegasus = input_get_drvdata(dev); struct pegasus *pegasus = input_get_drvdata(dev);
int retval; int error;
retval = usb_autopm_get_interface(pegasus->intf); error = usb_autopm_get_interface(pegasus->intf);
if (retval) if (error)
return retval; return error;
pegasus->irq->dev = pegasus->usbdev; pegasus->irq->dev = pegasus->usbdev;
if (usb_submit_urb(pegasus->irq, GFP_KERNEL)) if (usb_submit_urb(pegasus->irq, GFP_KERNEL)) {
retval = -EIO; error = -EIO;
goto err_autopm_put;
}
error = pegasus_set_mode(pegasus, PEN_MODE_XY, NOTETAKER_LED_MOUSE);
if (error)
goto err_kill_urb;
retval = pegasus_set_mode(pegasus, PEN_MODE_XY, NOTETAKER_LED_MOUSE); return 0;
err_kill_urb:
usb_kill_urb(pegasus->irq);
cancel_work_sync(&pegasus->init);
err_autopm_put:
usb_autopm_put_interface(pegasus->intf); usb_autopm_put_interface(pegasus->intf);
return error;
return retval;
} }
static void pegasus_close(struct input_dev *dev) static void pegasus_close(struct input_dev *dev)
{ {
struct pegasus *pegasus = input_get_drvdata(dev); struct pegasus *pegasus = input_get_drvdata(dev);
int autopm_error;
autopm_error = usb_autopm_get_interface(pegasus->intf);
usb_kill_urb(pegasus->irq); usb_kill_urb(pegasus->irq);
cancel_work_sync(&pegasus->init); cancel_work_sync(&pegasus->init);
usb_autopm_put_interface(pegasus->intf);
if (!autopm_error)
usb_autopm_put_interface(pegasus->intf);
} }
static int pegasus_probe(struct usb_interface *intf, static int pegasus_probe(struct usb_interface *intf,
......
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