git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
drivers
/
input
/
mouse
/
sentelic.c
diff --git
a/drivers/input/mouse/sentelic.c
b/drivers/input/mouse/sentelic.c
index
c5b12d2
..
86d6f39
100644
(file)
--- 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.
* Finger Sensing Pad PS/2 mouse driver.
*
* Copyright (C) 2005-2007 Asia Vital Components Co., Ltd.
- * Copyright (C) 2005-201
0
Tai-hwa Liang, Sentelic Corporation.
+ * Copyright (C) 2005-201
1
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
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@
-162,7
+162,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)
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 */
if ((v = fsp_test_invert_cmd(reg_val)) != reg_val) {
/* inversion is required */
@@
-261,7
+261,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)
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);
if ((v = fsp_test_invert_cmd(reg_val)) != reg_val) {
ps2_sendbyte(ps2dev, 0x47, FSP_CMD_TIMEOUT2);
@@
-309,7
+309,7
@@
static int fsp_get_buttons(struct psmouse *psmouse, int *btn)
};
int val;
};
int val;
- if (fsp_reg_read(psmouse, FSP_REG_TMOD_STATUS
1
, &val) == -1)
+ if (fsp_reg_read(psmouse, FSP_REG_TMOD_STATUS, &val) == -1)
return -EIO;
*btn = buttons[(val & 0x30) >> 4];
return -EIO;
*btn = buttons[(val & 0x30) >> 4];