diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 11:01:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 11:01:58 -0700 |
| commit | cdf4f383a4b0ffbf458f65380ecffbeee1f79841 (patch) | |
| tree | 8093cb3dbeda8827ca8b782f29474af523439c55 /drivers/input/keyboard/newtonkbd.c | |
| parent | 954b36d48b495afed2880320750858a2eae312c9 (diff) | |
| parent | e2e8115b54aa6f159ac3dfec8d3d23b0af5fbfa0 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
* master.kernel.org:/pub/scm/linux/kernel/git/dtor/input:
Input: iforce - remove some pointless casts
Input: psmouse - add support for Intellimouse 4.0
Input: atkbd - fix HANGEUL/HANJA keys
Input: fix misspelling of Hangeul key
Input: via-pmu - add input device support
Input: rearrange exports
Input: fix formatting to better follow CodingStyle
Input: reset name, phys and uniq when unregistering
Input: return correct size when reading modalias attribute
Input: change my e-mail address in MAINTAINERS file
Input: fix potential overflows in driver/input/keyboard
Input: fix potential overflows in driver/input/touchscreen
Input: fix potential overflows in driver/input/joystick
Input: fix potential overflows in driver/input/mouse
Input: fix accuracy of fixp-arith.h
Input: iforce - use ENOSPC instead of ENOMEM
Input: constify drivers/char/keyboard.c
Diffstat (limited to 'drivers/input/keyboard/newtonkbd.c')
| -rw-r--r-- | drivers/input/keyboard/newtonkbd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/newtonkbd.c b/drivers/input/keyboard/newtonkbd.c index d10983c521e6..40a3f551247e 100644 --- a/drivers/input/keyboard/newtonkbd.c +++ b/drivers/input/keyboard/newtonkbd.c @@ -96,7 +96,7 @@ static int nkbd_connect(struct serio *serio, struct serio_driver *drv) nkbd->serio = serio; nkbd->dev = input_dev; - sprintf(nkbd->phys, "%s/input0", serio->phys); + snprintf(nkbd->phys, sizeof(nkbd->phys), "%s/input0", serio->phys); memcpy(nkbd->keycode, nkbd_keycode, sizeof(nkbd->keycode)); input_dev->name = "Newton Keyboard"; |