diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-11-24 00:43:22 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-11-24 00:43:22 -0500 |
| commit | 4bdbd2807deeccc0793d57fb5120d7a53f2c0b3c (patch) | |
| tree | af7f75cdffeb2d25cc4c62574b7bb3194c1faf05 /drivers/macintosh/adbhid.c | |
| parent | e4477d2d1bc3e6c76e83926f7fa8c8f94ba42615 (diff) | |
| download | linux-4bdbd2807deeccc0793d57fb5120d7a53f2c0b3c.tar.gz | |
Input: handle errors from input_register_device in drivers/macintosh
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/macintosh/adbhid.c')
| -rw-r--r-- | drivers/macintosh/adbhid.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c index 5066e7a8ea9cd..1c7d6f221b557 100644 --- a/drivers/macintosh/adbhid.c +++ b/drivers/macintosh/adbhid.c @@ -689,7 +689,6 @@ adbhid_input_register(int id, int default_id, int original_handler_id, if (!hid || !input_dev) { err = -ENOMEM; goto fail; - } sprintf(hid->phys, "adb%d:%d.%02x/input", id, default_id, original_handler_id); @@ -807,7 +806,9 @@ adbhid_input_register(int id, int default_id, int original_handler_id, input_dev->keycode = hid->keycode; - input_register_device(input_dev); + err = input_register_device(input_dev); + if (err) + goto fail; if (default_id == ADB_KEYBOARD) { /* HACK WARNING!! This should go away as soon there is an utility @@ -820,7 +821,10 @@ adbhid_input_register(int id, int default_id, int original_handler_id, return 0; fail: input_free_device(input_dev); - kfree(hid); + if (hid) { + kfree(hid->keycode); + kfree(hid); + } adbhid[id] = NULL; return err; } |