Merge commit 'v3.3-rc6' into next

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/input/mouse/sentelic.c b/drivers/input/mouse/sentelic.c
index bab2d19e17f7..2a77a52d2e62 100644
--- a/drivers/input/mouse/sentelic.c
+++ b/drivers/input/mouse/sentelic.c
@@ -2,7 +2,7 @@
  * Finger Sensing Pad PS/2 mouse driver.
  *
  * Copyright (C) 2005-2007 Asia Vital Components Co., Ltd.
- * Copyright (C) 2005-2010 Tai-hwa Liang, Sentelic Corporation.
+ * Copyright (C) 2005-2011 Tai-hwa Liang, Sentelic Corporation.
  *
  *   This program is free software; you can redistribute it and/or
  *   modify it under the terms of the GNU General Public License
@@ -160,7 +160,7 @@ static int fsp_reg_write(struct psmouse *psmouse, int reg_addr, int reg_val)
         ps2_sendbyte(ps2dev, v, FSP_CMD_TIMEOUT2);
 
         if (ps2_sendbyte(ps2dev, 0xf3, FSP_CMD_TIMEOUT) < 0)
-                return -1;
+                goto out;
 
         if ((v = fsp_test_invert_cmd(reg_val)) != reg_val) {
                 /* inversion is required */
@@ -257,7 +257,7 @@ static int fsp_page_reg_write(struct psmouse *psmouse, int reg_val)
         ps2_sendbyte(ps2dev, 0x88, FSP_CMD_TIMEOUT2);
 
         if (ps2_sendbyte(ps2dev, 0xf3, FSP_CMD_TIMEOUT) < 0)
-                return -1;
+                goto out;
 
         if ((v = fsp_test_invert_cmd(reg_val)) != reg_val) {
                 ps2_sendbyte(ps2dev, 0x47, FSP_CMD_TIMEOUT2);
@@ -305,7 +305,7 @@ static int fsp_get_buttons(struct psmouse *psmouse, int *btn)
         };
         int val;
 
-        if (fsp_reg_read(psmouse, FSP_REG_TMOD_STATUS1, &val) == -1)
+        if (fsp_reg_read(psmouse, FSP_REG_TMOD_STATUS, &val) == -1)
                 return -EIO;
 
         *btn = buttons[(val & 0x30) >> 4];