diff options
| author | Dmitry Torokhov | 2012-10-01 23:20:58 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2012-10-01 23:20:58 +0200 |
| commit | dde3ada3d0069855eeb353707b2b0f946191cfd6 (patch) | |
| tree | bdc2d358f8dc7fc29000149ebc4db949934b15b2 /drivers/input/mouse | |
| parent | Input: wacom - mark Intuos5 pad as in-prox when touching buttons (diff) | |
| parent | Input: hgpk - use %*ph to dump small buffer (diff) | |
| download | kernel-qcow2-linux-dde3ada3d0069855eeb353707b2b0f946191cfd6.tar.gz kernel-qcow2-linux-dde3ada3d0069855eeb353707b2b0f946191cfd6.tar.xz kernel-qcow2-linux-dde3ada3d0069855eeb353707b2b0f946191cfd6.zip | |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.7 merge window.
Diffstat (limited to 'drivers/input/mouse')
| -rw-r--r-- | drivers/input/mouse/hgpk.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/input/mouse/hgpk.c b/drivers/input/mouse/hgpk.c index 575f880727fe..62be888e83d0 100644 --- a/drivers/input/mouse/hgpk.c +++ b/drivers/input/mouse/hgpk.c @@ -334,11 +334,8 @@ static bool hgpk_is_byte_valid(struct psmouse *psmouse, unsigned char *packet) if (!valid) psmouse_dbg(psmouse, - "bad data, mode %d (%d) %02x %02x %02x %02x %02x %02x\n", - priv->mode, pktcnt, - psmouse->packet[0], psmouse->packet[1], - psmouse->packet[2], psmouse->packet[3], - psmouse->packet[4], psmouse->packet[5]); + "bad data, mode %d (%d) %*ph\n", + priv->mode, pktcnt, 6, psmouse->packet); return valid; } @@ -1030,7 +1027,7 @@ static enum hgpk_model_t hgpk_get_model(struct psmouse *psmouse) return -EIO; } - psmouse_dbg(psmouse, "ID: %02x %02x %02x\n", param[0], param[1], param[2]); + psmouse_dbg(psmouse, "ID: %*ph\n", 3, param); /* HGPK signature: 0x67, 0x00, 0x<model> */ if (param[0] != 0x67 || param[1] != 0x00) |