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

Commit 62ecae09 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: wacom - properly enable runtime PM 



We need to always call usb_autopm_put_interface() in wacom_open(),
not only when initialization fails, otherwise the device will be
marked as PM-busy and will never be put in suspended state.

Based on patch by Oliver Neukum.

Acked-by: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 3136baf8

drivers/input/tablet/wacom_sys.c

+6 −3
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ static int wacom_open(struct input_dev *dev) 


out:

	mutex_unlock(&wacom->lock);

	if (retval)

	usb_autopm_put_interface(wacom->intf);

	return retval;

}
@@ -128,6 +127,9 @@ static int wacom_open(struct input_dev *dev) 
static void wacom_close(struct input_dev *dev)

{

	struct wacom *wacom = input_get_drvdata(dev);

	int autopm_error;



	autopm_error = usb_autopm_get_interface(wacom->intf);



	mutex_lock(&wacom->lock);

	usb_kill_urb(wacom->irq);
@@ -135,6 +137,7 @@ static void wacom_close(struct input_dev *dev) 
	wacom->intf->needs_remote_wakeup = 0;

	mutex_unlock(&wacom->lock);



	if (!autopm_error)

		usb_autopm_put_interface(wacom->intf);

}