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_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
[pandora-kernel.git]
/
drivers
/
input
/
keyboard
/
sunkbd.c
diff --git
a/drivers/input/keyboard/sunkbd.c
b/drivers/input/keyboard/sunkbd.c
index
b15b6d8
..
9dbd7b8
100644
(file)
--- a/
drivers/input/keyboard/sunkbd.c
+++ b/
drivers/input/keyboard/sunkbd.c
@@
-263,7
+263,7
@@
static int sunkbd_connect(struct serio *serio, struct serio_driver *drv)
goto fail;
}
goto fail;
}
- s
printf(sunkbd->name
, "Sun Type %d keyboard", sunkbd->type);
+ s
nprintf(sunkbd->name, sizeof(sunkbd->name)
, "Sun Type %d keyboard", sunkbd->type);
memcpy(sunkbd->keycode, sunkbd_keycode, sizeof(sunkbd->keycode));
input_dev->name = sunkbd->name;
memcpy(sunkbd->keycode, sunkbd_keycode, sizeof(sunkbd->keycode));
input_dev->name = sunkbd->name;