mirror of
https://github.com/torvalds/linux.git
synced 2024-10-24 14:10:59 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov: "Just a 2 small driver fixups here" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: wacom - fix a typo for Cintiq 22HDT Input: synaptics - fix sync lost after resume on some laptops
This commit is contained in:
commit
bb762929db
|
@ -1379,6 +1379,7 @@ static int synaptics_reconnect(struct psmouse *psmouse)
|
||||||
{
|
{
|
||||||
struct synaptics_data *priv = psmouse->private;
|
struct synaptics_data *priv = psmouse->private;
|
||||||
struct synaptics_data old_priv = *priv;
|
struct synaptics_data old_priv = *priv;
|
||||||
|
unsigned char param[2];
|
||||||
int retry = 0;
|
int retry = 0;
|
||||||
int error;
|
int error;
|
||||||
|
|
||||||
|
@ -1394,6 +1395,7 @@ static int synaptics_reconnect(struct psmouse *psmouse)
|
||||||
*/
|
*/
|
||||||
ssleep(1);
|
ssleep(1);
|
||||||
}
|
}
|
||||||
|
ps2_command(&psmouse->ps2dev, param, PSMOUSE_CMD_GETID);
|
||||||
error = synaptics_detect(psmouse, 0);
|
error = synaptics_detect(psmouse, 0);
|
||||||
} while (error && ++retry < 3);
|
} while (error && ++retry < 3);
|
||||||
|
|
||||||
|
|
|
@ -1966,7 +1966,8 @@ static const struct wacom_features wacom_features_0xF4 =
|
||||||
63, WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
|
63, WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
|
||||||
static const struct wacom_features wacom_features_0xF8 =
|
static const struct wacom_features wacom_features_0xF8 =
|
||||||
{ "Wacom Cintiq 24HD touch", WACOM_PKGLEN_INTUOS, 104480, 65600, 2047, /* Pen */
|
{ "Wacom Cintiq 24HD touch", WACOM_PKGLEN_INTUOS, 104480, 65600, 2047, /* Pen */
|
||||||
63, WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, .oVid = USB_VENDOR_ID_WACOM, .oPid = 0xf6 };
|
63, WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
|
||||||
|
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0xf6 };
|
||||||
static const struct wacom_features wacom_features_0xF6 =
|
static const struct wacom_features wacom_features_0xF6 =
|
||||||
{ "Wacom Cintiq 24HD touch", .type = WACOM_24HDT, /* Touch */
|
{ "Wacom Cintiq 24HD touch", .type = WACOM_24HDT, /* Touch */
|
||||||
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0xf8, .touch_max = 10 };
|
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0xf8, .touch_max = 10 };
|
||||||
|
@ -2009,7 +2010,8 @@ static const struct wacom_features wacom_features_0xFA =
|
||||||
63, WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
|
63, WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
|
||||||
static const struct wacom_features wacom_features_0x5B =
|
static const struct wacom_features wacom_features_0x5B =
|
||||||
{ "Wacom Cintiq 22HDT", WACOM_PKGLEN_INTUOS, 95840, 54260, 2047,
|
{ "Wacom Cintiq 22HDT", WACOM_PKGLEN_INTUOS, 95840, 54260, 2047,
|
||||||
63, WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x5e };
|
63, WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
|
||||||
|
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x5e };
|
||||||
static const struct wacom_features wacom_features_0x5E =
|
static const struct wacom_features wacom_features_0x5E =
|
||||||
{ "Wacom Cintiq 22HDT", .type = WACOM_24HDT,
|
{ "Wacom Cintiq 22HDT", .type = WACOM_24HDT,
|
||||||
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x5b, .touch_max = 10 };
|
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x5b, .touch_max = 10 };
|
||||||
|
@ -2042,7 +2044,7 @@ static const struct wacom_features wacom_features_0xE5 =
|
||||||
static const struct wacom_features wacom_features_0xE6 =
|
static const struct wacom_features wacom_features_0xE6 =
|
||||||
{ "Wacom ISDv4 E6", WACOM_PKGLEN_TPC2FG, 27760, 15694, 255,
|
{ "Wacom ISDv4 E6", WACOM_PKGLEN_TPC2FG, 27760, 15694, 255,
|
||||||
0, TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
|
0, TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
|
||||||
.touch_max = 2 };
|
.touch_max = 2 };
|
||||||
static const struct wacom_features wacom_features_0xEC =
|
static const struct wacom_features wacom_features_0xEC =
|
||||||
{ "Wacom ISDv4 EC", WACOM_PKGLEN_GRAPHIRE, 25710, 14500, 255,
|
{ "Wacom ISDv4 EC", WACOM_PKGLEN_GRAPHIRE, 25710, 14500, 255,
|
||||||
0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
|
0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
|
||||||
|
|
Loading…
Reference in New Issue
Block a user