diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-12 16:54:16 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-12 16:54:16 -0400 |
| commit | 875999c5539999f61a45620aae0c3e5fb1d2b035 (patch) | |
| tree | 4535032a8a10f5782c0aef6a620b1a624ea9f863 /drivers/s390/char/keyboard.c | |
| parent | 79072f38909e3d9883317238887460c39ddcc4cb (diff) | |
| parent | 26ec634c31a11a003040e10b4d650495158632fd (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/s390/char/keyboard.c')
| -rw-r--r-- | drivers/s390/char/keyboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c index 6badd8403409..d4d2ff0a9da2 100644 --- a/drivers/s390/char/keyboard.c +++ b/drivers/s390/char/keyboard.c | |||
| @@ -54,7 +54,7 @@ kbd_alloc(void) { | |||
| 54 | if (!kbd) | 54 | if (!kbd) |
| 55 | goto out; | 55 | goto out; |
| 56 | kbd->key_maps = kzalloc(sizeof(key_maps), GFP_KERNEL); | 56 | kbd->key_maps = kzalloc(sizeof(key_maps), GFP_KERNEL); |
| 57 | if (!key_maps) | 57 | if (!kbd->key_maps) |
| 58 | goto out_kbd; | 58 | goto out_kbd; |
| 59 | for (i = 0; i < ARRAY_SIZE(key_maps); i++) { | 59 | for (i = 0; i < ARRAY_SIZE(key_maps); i++) { |
| 60 | if (key_maps[i]) { | 60 | if (key_maps[i]) { |