--- drivers/input/mouse/synaptics.c

+++ drivers/input/mouse/synaptics.c

@@ -135,7 +135,8 @@ static int synaptics_capability(struct p

if (synaptics_send_cmd(psmouse, SYN_QUE_CAPABILITIES, cap))

return -1;

priv->capabilities = (cap[0] << 16) | (cap[1] << 8) | cap[2];

- priv->ext_cap = 0;

+ priv->ext_cap = priv->ext_cap_0c = 0;

+

if (!SYN_CAP_VALID(priv->capabilities))

return -1;

@@ -148,7 +149,7 @@ static int synaptics_capability(struct p

if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 1) {

if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_CAPAB, cap)) {

printk(KERN_ERR "Synaptics claims to have extended capabilities,"

- " but I'm not able to read them.");

+ " but I'm not able to read them.\n");

} else {

priv->ext_cap = (cap[0] << 16) | (cap[1] << 8) | cap[2];

@@ -160,6 +161,16 @@ static int synaptics_capability(struct p

priv->ext_cap &= 0xff0fff;

}

}

+

+ if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 4) {

+ if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_CAPAB_0C, cap)) {

+ printk(KERN_ERR "Synaptics claims to have extended capability 0x0c,"

+ " but I'm not able to read it.\n");

+ } else {

+ priv->ext_cap_0c = (cap[0] << 16) | (cap[1] << 8) | cap[2];

+ }

+ }

+

return 0;

}

@@ -346,7 +357,15 @@ static void synaptics_parse_hw_state(uns

hw->left = (buf[0] & 0x01) ? 1 : 0;

hw->right = (buf[0] & 0x02) ? 1 : 0;

- if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) {

+ if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) {

+ /*

+ * Clickpad's button is transmitted as middle button,

+ * however, since it is primary button, we will report

+ * it as BTN_LEFT.

+ */

+ hw->left = ((buf[0] ^ buf[3]) & 0x01) ? 1 : 0;

+

+ } else if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) {

hw->middle = ((buf[0] ^ buf[3]) & 0x01) ? 1 : 0;

if (hw->w == 2)

hw->scroll = (signed char)(buf[1]);

@@ -591,6 +610,12 @@ static void set_input_params(struct inpu

dev->absres[ABS_X] = priv->x_res;

dev->absres[ABS_Y] = priv->y_res;

+

+ if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) {

+ /* Clickpads report only left button */

+ __clear_bit(BTN_RIGHT, dev->keybit);

+ __clear_bit(BTN_MIDDLE, dev->keybit);

+ }

}

static void synaptics_disconnect(struct psmouse *psmouse)

@@ -689,10 +714,10 @@ int synaptics_init(struct psmouse *psmou

priv->pkt_type = SYN_MODEL_NEWABS(priv->model_id) ? SYN_NEWABS : SYN_OLDABS;

- printk(KERN_INFO "Synaptics Touchpad, model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx\n",

+ printk(KERN_INFO "Synaptics Touchpad, model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx/%#lx\n",

SYN_ID_MODEL(priv->identity),

SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity),

- priv->model_id, priv->capabilities, priv->ext_cap);

+ priv->model_id, priv->capabilities, priv->ext_cap, priv->ext_cap_0c);

set_input_params(psmouse->dev, priv);