Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (51 commits)
  Input: appletouch - give up maintainership
  Input: dm355evm_kbd - switch to using sparse keymap library
  Input: wistron_btns - switch to using sparse keymap library
  Input: add generic support for sparse keymaps
  Input: fix memory leak in force feedback core
  Input: wistron - remove identification strings from DMI table
  Input: psmouse - remove identification strings from DMI tables
  Input: atkbd - remove identification strings from DMI table
  Input: i8042 - remove identification strings from DMI tables
  DMI: allow omitting ident strings in DMI tables
  Input: psmouse - do not carry DMI data around
  Input: matrix-keypad - switch to using dev_pm_ops
  Input: keyboard - fix lack of locking when traversing handler->h_list
  Input: gpio_keys - scan gpio state at probe and resume time
  Input: keyboard - add locking around event handling
  Input: usbtouchscreen - add support for ET&T TC5UH touchscreen controller
  Input: xpad - add two new Xbox 360 devices
  Input: polled device - do not start polling if interval is zero
  Input: polled device - schedule first poll immediately
  Input: add S3C24XX touchscreen driver
  ...

1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c
index e354362f2971..63d4a67830f2 100644
--- a/drivers/input/mouse/trackpoint.c
+++ b/drivers/input/mouse/trackpoint.c
@@ -284,7 +284,6 @@ static int trackpoint_reconnect(struct psmouse *psmouse)
 
 int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
 {
-        struct trackpoint_data *priv;
         struct ps2dev *ps2dev = &psmouse->ps2dev;
         unsigned char firmware_id;
         unsigned char button_info;
@@ -301,8 +300,8 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
                 button_info = 0;
         }
 
-        psmouse->private = priv = kzalloc(sizeof(struct trackpoint_data), GFP_KERNEL);
-        if (!priv)
+        psmouse->private = kzalloc(sizeof(struct trackpoint_data), GFP_KERNEL);
+        if (!psmouse->private)
                 return -1;
 
         psmouse->vendor = "IBM";
@@ -311,7 +310,10 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
         psmouse->reconnect = trackpoint_reconnect;
         psmouse->disconnect = trackpoint_disconnect;
 
-        trackpoint_defaults(priv);
+        if ((button_info & 0x0f) >= 3)
+                __set_bit(BTN_MIDDLE, psmouse->dev->keybit);
+
+        trackpoint_defaults(psmouse->private);
         trackpoint_sync(psmouse);
 
         error = sysfs_create_group(&ps2dev->serio->dev.kobj, &trackpoint_attr_group);
@@ -319,7 +321,8 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
                 printk(KERN_ERR
                         "trackpoint.c: failed to create sysfs attributes, error: %d\n",
                         error);
-                kfree(priv);
+                kfree(psmouse->private);
+                psmouse->private = NULL;
                 return -1;
         }