aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2007-12-16 12:39:38 +0000
committerbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2007-12-16 12:39:38 +0000
commit4f8eb8daebd72bdc214c63a3b2577f95bbadb27d (patch)
tree41a90df3654e448cd50db889c503404ca74d86b7 /hw
parentbd464c2eef04b322a34517cb9886b12bbc045cd1 (diff)
downloadqemu-4f8eb8daebd72bdc214c63a3b2577f95bbadb27d.zip
qemu-4f8eb8daebd72bdc214c63a3b2577f95bbadb27d.tar.gz
qemu-4f8eb8daebd72bdc214c63a3b2577f95bbadb27d.tar.bz2
Work around a crash when timer signal occurs before main loop, original patch by 武田 俊也.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3820 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r--hw/pxa2xx_keypad.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/pxa2xx_keypad.c b/hw/pxa2xx_keypad.c
index b67b2cb..c6c7528 100644
--- a/hw/pxa2xx_keypad.c
+++ b/hw/pxa2xx_keypad.c
@@ -332,8 +332,6 @@ struct pxa2xx_keypad_s *pxa27x_keypad_init(target_phys_addr_t base,
void pxa27x_register_keypad(struct pxa2xx_keypad_s *kp, struct keymap *map,
int size)
{
- kp->map = (struct keymap *) qemu_mallocz(sizeof(struct keymap) * size);
-
if(!map || size < 0x80) {
fprintf(stderr, "%s - No PXA keypad map defined\n", __FUNCTION__);
exit(-1);