diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/input/keyboard/atakbd.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
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) |