diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-05-20 14:06:24 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-05-20 14:08:05 -0400 |
| commit | 250f972d85effad5b6e10da4bbd877e6a4b503b6 (patch) | |
| tree | 007393a6fc6439af7e0121dd99a6f9f9fb8405bc /drivers/input/keyboard/atakbd.c | |
| parent | 7372b0b122af0f6675f3ab65bfd91c8a438e0480 (diff) | |
| parent | bbe7b8bef48c567f5ff3f6041c1fb011292e8f12 (diff) | |
Merge branch 'timers/urgent' into timers/core
Reason: Get upstream fixes and kfree_rcu which is necessary for a
follow up patch.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/input/keyboard/atakbd.c')
| -rw-r--r-- | drivers/input/keyboard/atakbd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/keyboard/atakbd.c b/drivers/input/keyboard/atakbd.c index 1839194ea987..10bcd4ae5402 100644 --- a/drivers/input/keyboard/atakbd.c +++ b/drivers/input/keyboard/atakbd.c | |||
| @@ -223,8 +223,9 @@ static int __init atakbd_init(void) | |||
| 223 | return -ENODEV; | 223 | return -ENODEV; |
| 224 | 224 | ||
| 225 | // need to init core driver if not already done so | 225 | // need to init core driver if not already done so |
| 226 | if (atari_keyb_init()) | 226 | error = atari_keyb_init(); |
| 227 | return -ENODEV; | 227 | if (error) |
| 228 | return error; | ||
| 228 | 229 | ||
| 229 | atakbd_dev = input_allocate_device(); | 230 | atakbd_dev = input_allocate_device(); |
| 230 | if (!atakbd_dev) | 231 | if (!atakbd_dev) |