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

Commit 232f5693 authored by Ping Cheng's avatar Ping Cheng Committed by Dmitry Torokhov
Browse files

Input: wacom - ensure the device is initialized properly upon resume 



Call wacom_query_tablet_data() from wacom_resume() so the device will be
switched to Wacom mode upon resume. Devices that require this are: regular
tablets and two finger touch devices.

Signed-off-by: default avatarPing Cheng <pingc@wacom.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent e47c4f70

drivers/input/tablet/wacom.h

+4 −3
Original line number Diff line number Diff line 
/*

 * drivers/input/tablet/wacom.h

 *

 *  USB Wacom Graphire and Wacom Intuos tablet support

 *  USB Wacom tablet support

 *

 *  Copyright (c) 2000-2004 Vojtech Pavlik	<vojtech@ucw.cz>

 *  Copyright (c) 2000 Andreas Bach Aaen	<abach@stofanet.dk>
@@ -69,6 +69,7 @@ 
 *      v1.49 (pc) - Added support for USB Tablet PC (0x90, 0x93, and 0x9A)

 *      v1.50 (pc) - Fixed a TabletPC touch bug in 2.6.28

 *      v1.51 (pc) - Added support for Intuos4

 *      v1.52 (pc) - Query Wacom data upon system resume

 */



/*
@@ -89,9 +90,9 @@ 
/*

 * Version Information

 */

#define DRIVER_VERSION "v1.51"

#define DRIVER_VERSION "v1.52"

#define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>"

#define DRIVER_DESC "USB Wacom Graphire and Wacom Intuos tablet driver"

#define DRIVER_DESC "USB Wacom tablet driver"

#define DRIVER_LICENSE "GPL"



MODULE_AUTHOR(DRIVER_AUTHOR);

drivers/input/tablet/wacom_sys.c

+4 −3
Original line number Diff line number Diff line 
/*

 * drivers/input/tablet/wacom_sys.c

 *

 *  USB Wacom Graphire and Wacom Intuos tablet support - system specific code

 *  USB Wacom tablet support - system specific code

 */



/*
@@ -562,9 +562,10 @@ static int wacom_resume(struct usb_interface *intf) 
	int rv;



	mutex_lock(&wacom->lock);

	if (wacom->open)

	if (wacom->open) {

		rv = usb_submit_urb(wacom->irq, GFP_NOIO);

	else

		wacom_query_tablet_data(intf);

	} else

		rv = 0;

	mutex_unlock(&wacom->lock);