Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 368099
b: refs/heads/master
c: 39fbe58
h: refs/heads/master
i:
  368097: b252a78
  368095: b27e247
v: v3
  • Loading branch information
Dmitry Torokhov committed Apr 15, 2013
1 parent c4cf5be commit 161cdb7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cbaf7f808081e10bd2a1d57cc9ef0c5138ca23ce
refs/heads/master: 39fbe5855737b2a2b8e097373951bbe1a4fdb345
12 changes: 5 additions & 7 deletions trunk/drivers/input/mouse/alps.c
Original file line number Diff line number Diff line change
Expand Up @@ -1013,8 +1013,8 @@ static int alps_rpt_cmd(struct psmouse *psmouse, int init_command,
if (ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO))
return -EIO;

psmouse_dbg(psmouse, "%2.2X report: %2.2x %2.2x %2.2x\n",
repeated_command, param[0], param[1], param[2]);
psmouse_dbg(psmouse, "%2.2X report: %3ph\n",
repeated_command, param);
return 0;
}

Expand Down Expand Up @@ -1274,9 +1274,7 @@ static int alps_setup_trackstick_v3(struct psmouse *psmouse, int reg_base)
psmouse_warn(psmouse, "trackstick E7 report failed\n");
ret = -ENODEV;
} else {
psmouse_dbg(psmouse,
"trackstick E7 report: %2.2x %2.2x %2.2x\n",
param[0], param[1], param[2]);
psmouse_dbg(psmouse, "trackstick E7 report: %3ph\n", param);

/*
* Not sure what this does, but it is absolutely
Expand Down Expand Up @@ -1323,6 +1321,7 @@ static int alps_hw_init_v3(struct psmouse *psmouse)
reg_val = alps_probe_trackstick_v3(psmouse, ALPS_REG_BASE_PINNACLE);
if (reg_val == -EIO)
goto error;

if (reg_val == 0 &&
alps_setup_trackstick_v3(psmouse, ALPS_REG_BASE_PINNACLE) == -EIO)
goto error;
Expand Down Expand Up @@ -1676,8 +1675,7 @@ static int alps_identify(struct psmouse *psmouse, struct alps_data *priv)
}

psmouse_info(psmouse,
"Unknown ALPS touchpad: E7=%2.2x %2.2x %2.2x, EC=%2.2x %2.2x %2.2x\n",
e7[0], e7[1], e7[2], ec[0], ec[1], ec[2]);
"Unknown ALPS touchpad: E7=%3ph, EC=%3ph\n", e7, ec);

return -EINVAL;
}
Expand Down

0 comments on commit 161cdb7

Please sign in to comment.