Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 245271
b: refs/heads/master
c: 186f200
h: refs/heads/master
i:
  245269: 9f8b42c
  245267: 7daa075
  245263: 2db910b
v: v3
  • Loading branch information
Michael Schmitz authored and Geert Uytterhoeven committed May 19, 2011
1 parent 6f9da2b commit d38b53c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7786908c3c1bb38dcc5cd2c037251c05507eef16
refs/heads/master: 186f200a95cbd13c291cdd3ddeb07aad0a3782cc
5 changes: 3 additions & 2 deletions trunk/drivers/input/keyboard/atakbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,9 @@ static int __init atakbd_init(void)
return -ENODEV;

// need to init core driver if not already done so
if (atari_keyb_init())
return -ENODEV;
error = atari_keyb_init();
if (error)
return error;

atakbd_dev = input_allocate_device();
if (!atakbd_dev)
Expand Down
5 changes: 3 additions & 2 deletions trunk/drivers/input/mouse/atarimouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,9 @@ static int __init atamouse_init(void)
if (!MACH_IS_ATARI || !ATARIHW_PRESENT(ST_MFP))
return -ENODEV;

if (!atari_keyb_init())
return -ENODEV;
error = atari_keyb_init();
if (error)
return error;

atamouse_dev = input_allocate_device();
if (!atamouse_dev)
Expand Down

0 comments on commit d38b53c

Please sign in to comment.